diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-10 22:41:00 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-10 22:41:00 -0400 |
| commit | 533f258f364353f40850c16bf50fa08af9dc46a8 (patch) | |
| tree | b086ef719af6bd5b50fe4b942f9db0fc70378ca5 | |
| parent | 346755408a585e03e507ec9e9df37ac883eed4ee (diff) | |
| download | emacs-533f258f364353f40850c16bf50fa08af9dc46a8.tar.gz emacs-533f258f364353f40850c16bf50fa08af9dc46a8.tar.bz2 emacs-533f258f364353f40850c16bf50fa08af9dc46a8.zip | |
* src/keyboard.c (read_char): Don't break immediate_echo.
Fixes: debbugs:15332
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4e08178989e..e609c38be7e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-09-11 Stefan Monnier <monnier@iro.umontreal.ca> + + * keyboard.c (read_char): Don't break immediate_echo (bug#15332). + 2013-09-10 Stefan Monnier <monnier@iro.umontreal.ca> * eval.c (Feval): Document the new use of `lexical'. diff --git a/src/keyboard.c b/src/keyboard.c index 440820c57db..a768c9bb409 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2596,9 +2596,7 @@ read_char (int commandflag, Lisp_Object map, if (/* There currently is something in the echo area. */ !NILP (echo_area_buffer[0]) - && (/* And it's either not from echoing. */ - !EQ (echo_area_buffer[0], echo_message_buffer) - /* Or it's an echo from a different kboard. */ + && (/* It's an echo from a different kboard. */ || echo_kboard != current_kboard /* Or we explicitly allow overwriting whatever there is. */ || ok_to_echo_at_next_pause == NULL)) |