diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-01-19 14:23:18 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-01-19 14:23:18 +0100 |
| commit | 9367550017b1c592e40c276d81e23950f5f2f940 (patch) | |
| tree | a92a27cdb9360133c9334de73b820310217f639f | |
| parent | e3af763f4da9157de53f0533a7fb32fb831994e6 (diff) | |
| download | emacs-9367550017b1c592e40c276d81e23950f5f2f940.tar.gz | |
* 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)
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/eshell/esh-mode.el | 13 |
2 files changed, 16 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 138949b0c8e..cd7184c1b86 100644 --- 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 3d37ce87781..27f3411b4a9 100644 --- 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) |