Commit 7aa93795 authored by Glenn Morris's avatar Glenn Morris
Browse files

* 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.
parent 41f592d1
2010-10-23 Glenn Morris <rgm@gnu.org> 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-fns.el (doc-file-to-man, doc-file-to-info): New commands.
   
* help.el (finder-by-keyword): Remove unnecessary autoload. * help.el (finder-by-keyword): Remove unnecessary autoload.
......
...@@ -339,13 +339,15 @@ This variable is buffer-local." ...@@ -339,13 +339,15 @@ This variable is buffer-local."
;; Ubuntu's sudo prompts like `[sudo] password for user:' ;; Ubuntu's sudo prompts like `[sudo] password for user:'
;; Some implementations of passwd use "Password (again)" as the 2nd prompt. ;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
;; Something called "perforce" uses "Enter password:". ;; Something called "perforce" uses "Enter password:".
;; See M-x comint-testsuite--test-comint-password-prompt-regexp.
(defcustom comint-password-prompt-regexp (defcustom comint-password-prompt-regexp
(concat (concat
"\\(" "\\(^ *\\|"
(regexp-opt (regexp-opt
'("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login" '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the"
"Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad")) "Old" "old" "New" "new" "'s" "login"
" +\\)?" "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad") t)
" +\\)"
(regexp-opt (regexp-opt
'("password" "Password" "passphrase" "Passphrase" '("password" "Password" "passphrase" "Passphrase"
"pass phrase" "Pass phrase")) "pass phrase" "Pass phrase"))
...@@ -353,6 +355,7 @@ This variable is buffer-local." ...@@ -353,6 +355,7 @@ This variable is buffer-local."
\\(?: for [^:]+\\)?:\\s *\\'") \\(?: for [^:]+\\)?:\\s *\\'")
"Regexp matching prompts for passwords in the inferior process. "Regexp matching prompts for passwords in the inferior process.
This is used by `comint-watch-for-password-prompt'." This is used by `comint-watch-for-password-prompt'."
:version "24.1"
:type 'regexp :type 'regexp
:group 'comint) :group 'comint)
...@@ -3748,5 +3751,4 @@ REGEXP-GROUP is the regular expression group in REGEXP to use." ...@@ -3748,5 +3751,4 @@ REGEXP-GROUP is the regular expression group in REGEXP to use."
(provide 'comint) (provide 'comint)
;; arch-tag: 1793314c-09db-40be-9549-9aeae3e75164
;;; comint.el ends here ;;; comint.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment