diff options
| author | Eli Zaretskii | 2015-12-12 10:05:26 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-12-12 10:05:26 +0200 |
| commit | 0b7d6b026eb2cd69a90a9af41a4fca24389c5e47 (patch) | |
| tree | 6765bc60de4a36069951a6cdfb5e46297f6f8344 /src | |
| parent | 83114ccf77d2a5d59fccbdbda6edefacce1b979e (diff) | |
| download | emacs-0b7d6b026eb2cd69a90a9af41a4fca24389c5e47.tar.gz emacs-0b7d6b026eb2cd69a90a9af41a4fca24389c5e47.zip | |
Fix echo for "C-u"
* src/keyboard.c (command_loop_1): Undo last change. It caused
duplicate echo of C-u. (Bug#22107)
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 928d8496cdb..02bc7d2a0b7 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1486,14 +1486,11 @@ command_loop_1 (void) | |||
| 1486 | if (!CONSP (last_command_event)) | 1486 | if (!CONSP (last_command_event)) |
| 1487 | kset_last_repeatable_command (current_kboard, Vreal_this_command); | 1487 | kset_last_repeatable_command (current_kboard, Vreal_this_command); |
| 1488 | 1488 | ||
| 1489 | /* Don't reset this_command_key_count if we've processed | 1489 | this_command_key_count = 0; |
| 1490 | prefix-arg. */ | 1490 | this_single_command_key_start = 0; |
| 1491 | if (NILP (call0 (Qinternal_echo_keystrokes_prefix))) | 1491 | |
| 1492 | { | 1492 | if (current_kboard->immediate_echo |
| 1493 | this_command_key_count = 0; | 1493 | && !NILP (call0 (Qinternal_echo_keystrokes_prefix))) |
| 1494 | this_single_command_key_start = 0; | ||
| 1495 | } | ||
| 1496 | else if (current_kboard->immediate_echo) | ||
| 1497 | { | 1494 | { |
| 1498 | current_kboard->immediate_echo = false; | 1495 | current_kboard->immediate_echo = false; |
| 1499 | /* Refresh the echo message. */ | 1496 | /* Refresh the echo message. */ |