aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2014-06-26 15:00:42 -0400
committerGlenn Morris2014-06-26 15:00:42 -0400
commit64c3533166e1fa517422f89f953cfdaea6ee7bf0 (patch)
treeb317a5770db12cd74bbef35757965878b88b158e /lisp
parent2493e35c369caabf6a65e376fd0399e95b588bfd (diff)
downloademacs-64c3533166e1fa517422f89f953cfdaea6ee7bf0.tar.gz
emacs-64c3533166e1fa517422f89f953cfdaea6ee7bf0.zip
Warn about read-passwd in batch mode
* doc/lispref/minibuf.texi (Intro to Minibuffers): Batch mode is basic. (Reading a Password): Mention batch mode. * lisp/subr.el (read-passwd): Warn about batch mode. Fixes: debbugs:17839
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el7
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c8f118c8a3..0cc5b7fe71c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-06-26 Glenn Morris <rgm@gnu.org>
2
3 * subr.el (read-passwd): Warn about batch mode. (Bug#17839)
4
12014-06-26 Daiki Ueno <ueno@gnu.org> 52014-06-26 Daiki Ueno <ueno@gnu.org>
2 6
3 * emacs-lisp/package.el (package--check-signature): 7 * emacs-lisp/package.el (package--check-signature):
diff --git a/lisp/subr.el b/lisp/subr.el
index 700c072a81b..ac0e130b4e0 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2006,6 +2006,7 @@ If optional CONFIRM is non-nil, read the password twice to make sure.
2006Optional DEFAULT is a default password to use instead of empty input. 2006Optional DEFAULT is a default password to use instead of empty input.
2007 2007
2008This function echoes `.' for each character that the user types. 2008This function echoes `.' for each character that the user types.
2009Note that in batch mode, the input is not hidden!
2009 2010
2010Once the caller uses the password, it can erase the password 2011Once the caller uses the password, it can erase the password
2011by doing (clear-string STRING)." 2012by doing (clear-string STRING)."
@@ -2045,7 +2046,11 @@ by doing (clear-string STRING)."
2045 (add-hook 'after-change-functions hide-chars-fun nil 'local)) 2046 (add-hook 'after-change-functions hide-chars-fun nil 'local))
2046 (unwind-protect 2047 (unwind-protect
2047 (let ((enable-recursive-minibuffers t)) 2048 (let ((enable-recursive-minibuffers t))
2048 (read-string prompt nil t default)) ; t = "no history" 2049 (read-string
2050 (if noninteractive
2051 (format "%s[INPUT WILL NOT BE HIDDEN!] " prompt) ; bug#17839
2052 prompt)
2053 nil t default)) ; t = "no history"
2049 (when (buffer-live-p minibuf) 2054 (when (buffer-live-p minibuf)
2050 (with-current-buffer minibuf 2055 (with-current-buffer minibuf
2051 ;; Not sure why but it seems that there might be cases where the 2056 ;; Not sure why but it seems that there might be cases where the