diff options
author | Glenn Morris <[email protected]> | 2014-06-28 10:27:29 -0700 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2014-06-28 10:27:29 -0700 |
commit | e0d9c3c9a26ba2982595ec2ec4a1167ee7e39ddb (patch) | |
tree | 263b47445b665a686c37c5c5628f17446a98c3f8 /doc | |
parent | 14202f05ac84869af2d839ba022ea983b7642770 (diff) | |
parent | b084415e278d54c6f9ee8406b1af8adc2364576c (diff) |
Merge from emacs-24; up to 2014-06-12T14:55:[email protected]
Diffstat (limited to 'doc')
-rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
-rw-r--r-- | doc/lispref/minibuf.texi | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 2d202715a0..4302b53a63 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2014-06-28 Glenn Morris <[email protected]> + + * minibuf.texi (Intro to Minibuffers): Batch mode is basic. + (Reading a Password): Mention batch mode. (Bug#17839) + 2014-06-23 Glenn Morris <[email protected]> * Makefile.in (%.texi): Disable implicit rules. diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 19f941ba68..e76b827cd2 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -101,7 +101,9 @@ the minibuffer is in a separate frame. @xref{Minibuffers and Frames}. When Emacs is running in batch mode, any request to read from the minibuffer actually reads a line from the standard input descriptor that -was supplied when Emacs was started. +was supplied when Emacs was started. This supports only basic input: +none of the special minibuffer features (history, completion, +password hiding, etc.) are available in batch mode. @node Text from Minibuffer @section Reading Text Strings with the Minibuffer @@ -2146,7 +2148,8 @@ function @code{read-passwd}. @defun read-passwd prompt &optional confirm default This function reads a password, prompting with @var{prompt}. It does not echo the password as the user types it; instead, it echoes @samp{.} -for each character in the password. +for each character in the password. (Note that in batch mode, the +input is not hidden.) The optional argument @var{confirm}, if non-@code{nil}, says to read the password twice and insist it must be the same both times. If it isn't |