diff options
| author | Stefan Monnier | 2013-09-10 23:31:06 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-09-10 23:31:06 -0400 |
| commit | 765da53c2084e3687201f06f8d050497f0e06da9 (patch) | |
| tree | 4923fbb1624a6707aa3cfaf9af6229706e01cee9 | |
| parent | 533f258f364353f40850c16bf50fa08af9dc46a8 (diff) | |
| download | emacs-765da53c2084e3687201f06f8d050497f0e06da9.tar.gz emacs-765da53c2084e3687201f06f8d050497f0e06da9.zip | |
* keyboard.c (read_char): Fix last change.
Fixes: debbugs:15332
| -rw-r--r-- | src/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index a768c9bb409..020c8859941 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -2597,7 +2597,7 @@ read_char (int commandflag, Lisp_Object map, | |||
| 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 | && (/* It's an echo from a different kboard. */ | 2599 | && (/* It's an echo from a different kboard. */ |
| 2600 | || echo_kboard != current_kboard | 2600 | echo_kboard != current_kboard |
| 2601 | /* Or we explicitly allow overwriting whatever there is. */ | 2601 | /* Or we explicitly allow overwriting whatever there is. */ |
| 2602 | || ok_to_echo_at_next_pause == NULL)) | 2602 | || ok_to_echo_at_next_pause == NULL)) |
| 2603 | cancel_echoing (); | 2603 | cancel_echoing (); |