* eshell/esh-mode.el (eshell-password-prompt-regexp):

Use `password-word-equivalents'.
(eshell-watch-for-password-prompt): Let-bind `case-fold-search'
to t.  (Bug#5664, Bug#13124)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 138949b0c8e7a910ce520e9558163defbce32f52..cd7184c1b867322afa228b0dee0066f8c01ed53b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-19  Michael Albinus  <michael.albinus@gmx.de>
+
+       * eshell/esh-mode.el (eshell-password-prompt-regexp):
+       Use `password-word-equivalents'.
+       (eshell-watch-for-password-prompt): Let-bind `case-fold-search'
+       to t.  (Bug#5664, Bug#13124)
+
 2014-01-19  Alan Mackenzie  <acm@muc.de>
 
        Bind open-paren-in-column-0-is-defun-start to nil at some entry
@@ -30,8 +37,8 @@
 
 2014-01-17  Michael Albinus  <michael.albinus@gmx.de>
 
-       * net/tramp.el (tramp-password-prompt-regexp): Use
-       `password-word-equivalents' if available.
+       * net/tramp.el (tramp-password-prompt-regexp):
+       Use `password-word-equivalents' if available.
        (tramp-action-password, tramp-process-one-action)
        (tramp-read-passwd): Let-bind `case-fold-search' to t.  (Bug#13124)
 

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 3d37ce87781d168bf0acd71aa79b4a43af62aa87..27f3411b4a93e34649e18c7d82f4701266e8633c 100644 (file)
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -182,7 +182,7 @@ inserted.  They return the string as it should be inserted."
   :group 'eshell-mode)
 
 (defcustom eshell-password-prompt-regexp
-  "[Pp]ass\\(word\\|phrase\\).*:\\s *\\'"
+  (format "\\(%s\\).*:\\s *\\'" (regexp-opt password-word-equivalents))
   "Regexp matching prompts for passwords in the inferior process.
 This is used by `eshell-watch-for-password-prompt'."
   :type 'regexp
@@ -947,11 +947,12 @@ buffer's process if STRING contains a password prompt defined by
 This function could be in the list `eshell-output-filter-functions'."
   (when (eshell-interactive-process)
     (save-excursion
-      (goto-char eshell-last-output-block-begin)
-      (beginning-of-line)
-      (if (re-search-forward eshell-password-prompt-regexp
-                            eshell-last-output-end t)
-         (eshell-send-invisible)))))
+      (let ((case-fold-search t))
+       (goto-char eshell-last-output-block-begin)
+       (beginning-of-line)
+       (if (re-search-forward eshell-password-prompt-regexp
+                              eshell-last-output-end t)
+           (eshell-send-invisible))))))
 
 (custom-add-option 'eshell-output-filter-functions
                   'eshell-watch-for-password-prompt)