aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-05-18 12:38:35 -0700
committerGlenn Morris2013-05-18 12:38:35 -0700
commit8051fccd4636dd0e7547c1f012e0447ed31ccbea (patch)
tree30d85175c0501eefd3e8a1f69e5413cd66f47b82
parent6b56a60ae870938885665e211b97df929d6fb85b (diff)
downloademacs-8051fccd4636dd0e7547c1f012e0447ed31ccbea.tar.gz
emacs-8051fccd4636dd0e7547c1f012e0447ed31ccbea.zip
comint-password-prompt-regexp tweak
Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00401.html * lisp/comint.el (comint-password-prompt-regexp): Allow "password for XXX" where XXX contains colons (eg https://...).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/comint.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4bb56a1d6f..d5957fb01c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-05-18 Glenn Morris <rgm@gnu.org>
2
3 * comint.el (comint-password-prompt-regexp):
4 Allow "password for XXX" where XXX contains colons (eg https://...).
5
12013-05-18 Leo Liu <sdl.web@gmail.com> 62013-05-18 Leo Liu <sdl.web@gmail.com>
2 7
3 * progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR 8 * progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR
diff --git a/lisp/comint.el b/lisp/comint.el
index 956e8f86ccb..5680b9aaa2a 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -351,7 +351,7 @@ This variable is buffer-local."
351 '("password" "Password" "passphrase" "Passphrase" 351 '("password" "Password" "passphrase" "Passphrase"
352 "pass phrase" "Pass phrase" "Response")) 352 "pass phrase" "Pass phrase" "Response"))
353 "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\ 353 "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\
354\\(?: for [^:]+\\)?:\\s *\\'") 354\\(?: for .+\\)?:\\s *\\'")
355 "Regexp matching prompts for passwords in the inferior process. 355 "Regexp matching prompts for passwords in the inferior process.
356This is used by `comint-watch-for-password-prompt'." 356This is used by `comint-watch-for-password-prompt'."
357 :version "24.1" 357 :version "24.1"