procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Use `password-word-equivalents'.
(eshell-watch-for-password-prompt): Let-bind `case-fold-search'
to t.  (Bug#5664, Bug#13124)
This commit is contained in:
Michael Albinus 2014-01-19 14:23:18 +01:00
parent e3af763f4d
commit 9367550017
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/ChangeLog
View file

@ -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)

13
lisp/eshell/esh-mode.el
View file

@ -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)