diff options
| author | Glenn Morris | 2021-03-12 08:47:41 -0800 |
|---|---|---|
| committer | Glenn Morris | 2021-03-12 08:47:41 -0800 |
| commit | 7c3ec4ef35de78e99c6e97ec9e1ac7666a9c4d67 (patch) | |
| tree | d7055aaa00a42c0df5c34696e9b0ff84eb102f6c | |
| parent | a49b2aa5c33b389e2c7d976a5d3eed8e65ab30e9 (diff) | |
| parent | fc83f3795174213a412920232c85377f2a30bb7f (diff) | |
| download | emacs-7c3ec4ef35de78e99c6e97ec9e1ac7666a9c4d67.tar.gz emacs-7c3ec4ef35de78e99c6e97ec9e1ac7666a9c4d67.zip | |
Merge from origin/emacs-27
fc83f37951 Fix initialization of 'while-no-input-ignore-events'
8f603da44c Update documentation of reading passwords
| -rw-r--r-- | doc/emacs/mini.texi | 3 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index f81e64bdf9b..9c1b9757593 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi | |||
| @@ -800,6 +800,7 @@ can re-execute a command by calling @code{eval} with the | |||
| 800 | 800 | ||
| 801 | @node Passwords | 801 | @node Passwords |
| 802 | @section Entering passwords | 802 | @section Entering passwords |
| 803 | @cindex entering passwords | ||
| 803 | 804 | ||
| 804 | Sometimes, you may need to enter a password into Emacs. For instance, | 805 | Sometimes, you may need to enter a password into Emacs. For instance, |
| 805 | when you tell Emacs to visit a file on another machine via a network | 806 | when you tell Emacs to visit a file on another machine via a network |
| @@ -810,7 +811,7 @@ access to the machine (@pxref{Remote Files}). | |||
| 810 | displays a prompt in the echo area (such as @samp{Password: }); after | 811 | displays a prompt in the echo area (such as @samp{Password: }); after |
| 811 | you type the required password, press @key{RET} to submit it. To | 812 | you type the required password, press @key{RET} to submit it. To |
| 812 | prevent others from seeing your password, every character you type is | 813 | prevent others from seeing your password, every character you type is |
| 813 | displayed as a dot (@samp{.}) instead of its usual form. | 814 | displayed as an asterisk (@samp{*}) instead of its usual form. |
| 814 | 815 | ||
| 815 | Most of the features and commands associated with the minibuffer | 816 | Most of the features and commands associated with the minibuffer |
| 816 | @emph{cannot} be used when entering a password. There is no history | 817 | @emph{cannot} be used when entering a password. There is no history |
diff --git a/src/keyboard.c b/src/keyboard.c index 9ee4c4f6d68..e3fc6adf813 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -12380,8 +12380,6 @@ syms_of_keyboard_for_pdumper (void) | |||
| 12380 | eassert (initial_kboard == NULL); | 12380 | eassert (initial_kboard == NULL); |
| 12381 | initial_kboard = allocate_kboard (Qt); | 12381 | initial_kboard = allocate_kboard (Qt); |
| 12382 | 12382 | ||
| 12383 | Vwhile_no_input_ignore_events = Qnil; | ||
| 12384 | |||
| 12385 | inhibit_record_char = false; | 12383 | inhibit_record_char = false; |
| 12386 | } | 12384 | } |
| 12387 | 12385 | ||