aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2013-09-10 22:41:00 -0400
committerStefan Monnier2013-09-10 22:41:00 -0400
commit533f258f364353f40850c16bf50fa08af9dc46a8 (patch)
treeb086ef719af6bd5b50fe4b942f9db0fc70378ca5 /src
parent346755408a585e03e507ec9e9df37ac883eed4ee (diff)
downloademacs-533f258f364353f40850c16bf50fa08af9dc46a8.tar.gz
emacs-533f258f364353f40850c16bf50fa08af9dc46a8.zip
* src/keyboard.c (read_char): Don't break immediate_echo.
Fixes: debbugs:15332
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c4
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 @@
12013-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * keyboard.c (read_char): Don't break immediate_echo (bug#15332).
4
12013-09-10 Stefan Monnier <monnier@iro.umontreal.ca> 52013-09-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * eval.c (Feval): Document the new use of `lexical'. 7 * 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,
2596 2596
2597 if (/* There currently is something in the echo area. */ 2597 if (/* There currently is something in the echo area. */
2598 !NILP (echo_area_buffer[0]) 2598 !NILP (echo_area_buffer[0])
2599 && (/* And it's either not from echoing. */ 2599 && (/* It's an echo from a different kboard. */
2600 !EQ (echo_area_buffer[0], echo_message_buffer)
2601 /* Or it's an echo from a different kboard. */
2602 || echo_kboard != current_kboard 2600 || echo_kboard != current_kboard
2603 /* Or we explicitly allow overwriting whatever there is. */ 2601 /* Or we explicitly allow overwriting whatever there is. */
2604 || ok_to_echo_at_next_pause == NULL)) 2602 || ok_to_echo_at_next_pause == NULL))