Update comint-password-prompt-regexp (Bug#2817).

* comint.el (comint-password-prompt-regexp): Use regexp-opt, and
recognize ssh-keygen prompt (Bug#2817).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 102ae6c37feef55555cf90bfff17e4c5f0760550..8bf9dcd4607ab81267a31c033b40d1b3d33d03c8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-10  Jari Aalto  <jari.aalto@cante.net>
+
+       * comint.el (comint-password-prompt-regexp): Use regexp-opt, and
+       recognize ssh-keygen prompt (Bug#2817).
+
 2010-04-10  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-do-copy-or-rename-file): Add progress reporter.

diff --git a/lisp/comint.el b/lisp/comint.el
index f66cdf1bb9de275704ae50ea2ca6d23a2f822139..8defc3c7800334063d94137516ce8a40519f0afa 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -340,11 +340,17 @@ This variable is buffer-local."
 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
 ;; Something called "perforce" uses "Enter password:".
 (defcustom comint-password-prompt-regexp
-  "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
-Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\
-\[Pp]assword\\( (again)\\)?\\|\
-pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\
-\\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'"
+  (concat
+   "^\\("
+   (regexp-opt
+    '("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login"
+      "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad"))
+   " +\\)?"
+   (regexp-opt
+    '("password" "Password" "passphrase" "Passphrase"
+      "pass phrase" "Pass phrase"))
+   "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\
+\\(?: for [^:]+\\)?:\\s *\\'")
   "Regexp matching prompts for passwords in the inferior process.
 This is used by `comint-watch-for-password-prompt'."
   :type 'regexp