diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2015-02-18 05:09:12 +0100 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2015-02-18 05:09:12 +0100 |
| commit | 81d89d88aef5de720e7fbeecbfb295d6eaf6fd37 (patch) | |
| tree | 27b22c06793851e03d0991d1b48e0831878d4880 | |
| parent | 8338e4420d4a0fd375f36698b5be54a65fe9cbb7 (diff) | |
| download | emacs-81d89d88aef5de720e7fbeecbfb295d6eaf6fd37.tar.gz | |
Fixes display of prefix argument when input-method-function
* keyboard.c (read_char): When there is an input method function,
do not restore the echo area if a prefix argument is being
introduced. (Bug#19875)
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/keyboard.c | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 76e195605fd..8a3b534e7ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-18 Oscar Fuentes <ofv@wanadoo.es> + + * keyboard.c (read_char): When there is an input method function, + do not restore the echo area if a prefix argument is being + introduced. (Bug#19875) + 2015-02-16 Kelly Dean <kelly@prtime.org> * src/keyboard.c (timer_check_2): Fix incorrect comment. diff --git a/src/keyboard.c b/src/keyboard.c index ac70062a79b..4f6a4414a04 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3095,7 +3095,14 @@ read_char (int commandflag, Lisp_Object map, cancel_echoing (); ok_to_echo_at_next_pause = saved_ok_to_echo; - kset_echo_string (current_kboard, saved_echo_string); + /* Do not restore the echo area string when the user is + introducing a prefix argument. Otherwise we end with + repetitions of the partially introduced prefix + argument. (bug#19875) */ + if (NILP (intern ("prefix-arg"))) + { + kset_echo_string (current_kboard, saved_echo_string); + } current_kboard->echo_after_prompt = saved_echo_after_prompt; if (saved_immediate_echo) echo_now (); |