diff options
| author | Glenn Morris | 2018-10-09 13:12:55 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-10-09 13:12:55 -0700 |
| commit | b4e664f3a4222c0f95322fabd184a69f5dc953ed (patch) | |
| tree | 0e166b4928cf2b11fc4540c481eca0f72052a295 /doc | |
| parent | 86b53729c0fda525a7c0a050fcdc8dea81c8eff1 (diff) | |
| parent | 86d2169ac3458412a084c7fc4047c3a389924cad (diff) | |
| download | emacs-b4e664f3a4222c0f95322fabd184a69f5dc953ed.tar.gz emacs-b4e664f3a4222c0f95322fabd184a69f5dc953ed.zip | |
Merge from origin/emacs-26
86d2169 Avoid ridiculously high stack limit requests on macOS
ac3622c Improve documentation of 'read-hide-char'
# Conflicts:
# src/emacs.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/minibuf.texi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 55fde747592..5c660551d23 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi | |||
| @@ -2242,6 +2242,7 @@ Here is an example of using this function: | |||
| 2242 | To read a password to pass to another program, you can use the | 2242 | To read a password to pass to another program, you can use the |
| 2243 | function @code{read-passwd}. | 2243 | function @code{read-passwd}. |
| 2244 | 2244 | ||
| 2245 | @vindex read-hide-char | ||
| 2245 | @defun read-passwd prompt &optional confirm default | 2246 | @defun read-passwd prompt &optional confirm default |
| 2246 | This function reads a password, prompting with @var{prompt}. It does | 2247 | This function reads a password, prompting with @var{prompt}. It does |
| 2247 | not echo the password as the user types it; instead, it echoes | 2248 | not echo the password as the user types it; instead, it echoes |