[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102056: * lisp/comint.el (comint-pas
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102056: * lisp/comint.el (comint-password-prompt-regexp): Make it less vague. |
Date: |
Sat, 23 Oct 2010 12:56:57 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102056
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-23 12:56:57 -0700
message:
* 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.
modified:
lisp/ChangeLog
lisp/comint.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-23 02:46:06 +0000
+++ b/lisp/ChangeLog 2010-10-23 19:56:57 +0000
@@ -1,5 +1,8 @@
2010-10-23 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'lisp/comint.el'
--- a/lisp/comint.el 2010-10-02 02:46:13 +0000
+++ b/lisp/comint.el 2010-10-23 19:56:57 +0000
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102056: * lisp/comint.el (comint-password-prompt-regexp): Make it less vague.,
Glenn Morris <=