diff options
| author | Kenichi Handa <handa@gnu.org> | 2014-07-02 00:34:58 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2014-07-02 00:34:58 +0900 |
| commit | 763a11d0d0dcf543e89a22c98f55ea07c40ceefa (patch) | |
| tree | 9ecaec1b8a509a799903926ecd961ab905a1b1bd /lisp/subr.el | |
| parent | 0782685d43f026b2366dbacbebc79021a9df50c6 (diff) | |
| parent | a519335cc3a00f3d4d8efac2c08d9b6b17c7fcf0 (diff) | |
| download | emacs-763a11d0d0dcf543e89a22c98f55ea07c40ceefa.tar.gz | |
merge trunk
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 09a085288a5..a0c56bf9752 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2016,6 +2016,7 @@ If optional CONFIRM is non-nil, read the password twice to make sure. Optional DEFAULT is a default password to use instead of empty input. This function echoes `.' for each character that the user types. +Note that in batch mode, the input is not hidden! Once the caller uses the password, it can erase the password by doing (clear-string STRING)." @@ -2055,7 +2056,11 @@ by doing (clear-string STRING)." (add-hook 'after-change-functions hide-chars-fun nil 'local)) (unwind-protect (let ((enable-recursive-minibuffers t)) - (read-string prompt nil t default)) ; t = "no history" + (read-string + (if noninteractive + (format "%s[INPUT WILL NOT BE HIDDEN!] " prompt) ; bug#17839 + prompt) + nil t default)) ; t = "no history" (when (buffer-live-p minibuf) (with-current-buffer minibuf ;; Not sure why but it seems that there might be cases where the |