diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-15 02:07:53 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-15 02:07:53 +0000 |
| commit | b2529d56b5126319a1659dc1530d6fc102cc21d6 (patch) | |
| tree | d538297f4ddc6c9200bfed9a1a67ddb479dcc7da /lisp/comint.el | |
| parent | decb374a426c8d095d144829791305d91a26b7b7 (diff) | |
| parent | 69779ec883ae09f0187aa961930e7b308a71eebb (diff) | |
| download | emacs-b2529d56b5126319a1659dc1530d6fc102cc21d6.tar.gz | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 116-121)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-889
Diffstat (limited to 'lisp/comint.el')
| -rw-r--r-- | lisp/comint.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index d08b2013426..623eef17327 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -337,7 +337,7 @@ This variable is buffer-local." ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. (defcustom comint-password-prompt-regexp "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ -Kerberos \\|CVS \\|UNIX \\| SMB \\|^\\)\ +Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|^\\)\ \[Pp]assword\\( (again)\\)?\\|\ pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" |