[Emacs-diffs] trunk r116071: * eshell/esh-mode.el (eshell-password-prompt-regexp):

[Michael Albinus]

------------------------------------------------------------
revno: 116071
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2014-01-19 14:23:18 +0100
message:
  * 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)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/eshell/esh-mode.el        eshmode.el-20091113204419-o5vbwnq5f7feedwu-1848

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-19 12:32:47 +0000
+++ b/lisp/ChangeLog    2014-01-19 13:23:18 +0000
@@ -1,3 +1,10 @@
+2014-01-19  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        Bind open-paren-in-column-0-is-defun-start to nil at some entry
@@ -30,8 +37,8 @@
 
 2014-01-17  Michael Albinus  <address@hidden>
 
-       * 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)
 

=== modified file 'lisp/eshell/esh-mode.el'
--- a/lisp/eshell/esh-mode.el   2014-01-13 22:21:32 +0000
+++ b/lisp/eshell/esh-mode.el   2014-01-19 13:23:18 +0000
@@ -182,7 +182,7 @@
   :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 @@
 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)