From 81d89d88aef5de720e7fbeecbfb295d6eaf6fd37 Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Wed, 18 Feb 2015 05:09:12 +0100 Subject: [PATCH] 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) --- src/ChangeLog | 6 ++++++ src/keyboard.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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 + + * 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 * 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 (); -- 2.39.2