From: Glenn Morris <rgm@gnu.org>
Date: Sat, 23 Oct 2010 19:56:57 +0000 (-0700)
Subject: * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~508
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7aa93795cbf073ff3b4a20639ff2a4e34d9716e5;p=emacs.git

* lisp/comint.el (comint-password-prompt-regexp): Make it less vague.
Bump custom version.

The initial regexp-opt was bracketed by \\( \\)?, so it might as well
have not been there at all.  This change makes it non-optional, and
adds back "^".  Hopefully the behaviour is now closer to that of emacs-23,
before it was re-written in http://debbugs.gnu.org/2817.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8ec5b56933..2a0281bf595 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-23  Glenn Morris  <rgm@gnu.org>
 
+	* comint.el (comint-password-prompt-regexp): Make it less vague.
+	Bump version.
+
 	* help-fns.el (doc-file-to-man, doc-file-to-info): New commands.
 
 	* help.el (finder-by-keyword): Remove unnecessary autoload.
diff --git a/lisp/comint.el b/lisp/comint.el
index f9346f64c1f..0eee4128a2b 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -339,13 +339,15 @@ This variable is buffer-local."
 ;; Ubuntu's sudo prompts like `[sudo] password for user:'
 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
 ;; Something called "perforce" uses "Enter password:".
+;; See M-x comint-testsuite--test-comint-password-prompt-regexp.
 (defcustom comint-password-prompt-regexp
   (concat
-   "\\("
+   "\\(^ *\\|"
    (regexp-opt
-    '("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login"
-      "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad"))
-   " +\\)?"
+    '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the"
+      "Old" "old" "New" "new" "'s" "login"
+      "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad") t)
+   " +\\)"
    (regexp-opt
     '("password" "Password" "passphrase" "Passphrase"
       "pass phrase" "Pass phrase"))
@@ -353,6 +355,7 @@ This variable is buffer-local."
 \\(?: for [^:]+\\)?:\\s *\\'")
   "Regexp matching prompts for passwords in the inferior process.
 This is used by `comint-watch-for-password-prompt'."
+  :version "24.1"
   :type 'regexp
   :group 'comint)
 
@@ -3748,5 +3751,4 @@ REGEXP-GROUP is the regular expression group in REGEXP to use."
 
 (provide 'comint)
 
-;; arch-tag: 1793314c-09db-40be-9549-9aeae3e75164
 ;;; comint.el ends here