Mercurial > emacs

changeset 111119:80b566568995

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Glenn Morris <rgm@gnu.org>
date Sat, 23 Oct 2010 12:56:57 -0700
parents baf0b339ec21
children 8764fdce10f5
files lisp/ChangeLog lisp/comint.el
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Oct 23 12:51:14 2010 -0700
+++ b/lisp/ChangeLog	Sat Oct 23 12:56:57 2010 -0700
@@ -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.
--- a/lisp/comint.el	Sat Oct 23 12:51:14 2010 -0700
+++ b/lisp/comint.el	Sat Oct 23 12:56:57 2010 -0700
@@ -339,13 +339,15 @@
 ;; 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 @@
 \\(?: 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 @@
 
 (provide 'comint)
 
-;; arch-tag: 1793314c-09db-40be-9549-9aeae3e75164
 ;;; comint.el ends here