procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_echo_area

Browse source 
(read_key_sequence): Test it here, as before.
(bug#22825).
This commit is contained in:
Stefan Monnier 2016-03-14 20:52:34 -04:00
parent 8475f3da53
commit e6776f8362
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/keyboard.c
View file

@ -430,10 +430,9 @@ kset_system_key_syms (struct kboard *kb, Lisp_Object val)
static bool static bool
echo_keystrokes_p (void) echo_keystrokes_p (void)
{ {
return (!cursor_in_echo_area) return (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
&& (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0 : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0
: INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0 : false);
: false);
} }
/* Add C to the echo string, without echoing it immediately. C can be /* Add C to the echo string, without echoing it immediately. C can be
@ -8902,7 +8901,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
if (!echo_keystrokes_p ()) if (!echo_keystrokes_p ())
current_kboard->immediate_echo = false; current_kboard->immediate_echo = false;
} }
else if (echo_keystrokes_p ()) else if (cursor_in_echo_area /* FIXME: Not sure why we test this here,
maybe we should just drop this test. */
&& echo_keystrokes_p ())
/* This doesn't put in a dash if the echo buffer is empty, so /* This doesn't put in a dash if the echo buffer is empty, so
you don't always see a dash hanging out in the minibuffer. */ you don't always see a dash hanging out in the minibuffer. */
echo_dash (); echo_dash ();