[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 e6776f8: * src/keyboard.c (echo_keystrokes_p): Do
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-25 e6776f8: * src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_echo_area |
Date: |
Tue, 15 Mar 2016 00:52:40 +0000 |
branch: emacs-25
commit e6776f8362bbf6466c671cc8d381ba7da9e95301
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_echo_area
(read_key_sequence): Test it here, as before.
(bug#22825).
---
src/keyboard.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index 29d6d67..53030e2 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -430,10 +430,9 @@ kset_system_key_syms (struct kboard *kb, Lisp_Object val)
static bool
echo_keystrokes_p (void)
{
- return (!cursor_in_echo_area)
- && (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
- : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0
- : false);
+ return (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
+ : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0
+ : false);
}
/* 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 ())
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
you don't always see a dash hanging out in the minibuffer. */
echo_dash ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 e6776f8: * src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_echo_area,
Stefan Monnier <=