aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 3b0597cb337..67bf02c4c83 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * comint.el (comint-password-prompt-regexp): Accept "Response" as
4 a password-like phrase.
5
12011-06-30 Mastake YAMATO <yamato@redhat.com> 62011-06-30 Mastake YAMATO <yamato@redhat.com>
2 7
3 * progmodes/cc-guess.el: New file. 8 * progmodes/cc-guess.el: New file.
diff --git a/lisp/comint.el b/lisp/comint.el
index 5548d19ad30..2349fc0edd9 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -347,7 +347,7 @@ This variable is buffer-local."
347 " +\\)" 347 " +\\)"
348 (regexp-opt 348 (regexp-opt
349 '("password" "Password" "passphrase" "Passphrase" 349 '("password" "Password" "passphrase" "Passphrase"
350 "pass phrase" "Pass phrase")) 350 "pass phrase" "Pass phrase" "Response"))
351 "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\ 351 "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\
352\\(?: for [^:]+\\)?:\\s *\\'") 352\\(?: for [^:]+\\)?:\\s *\\'")
353 "Regexp matching prompts for passwords in the inferior process. 353 "Regexp matching prompts for passwords in the inferior process.