aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2017-05-27 15:57:38 +0300
committerEli Zaretskii2017-05-27 15:57:38 +0300
commit3fc36f427a6dfe5366fd1391fee1d037a1bd6cd7 (patch)
tree5a1cc09ed3416973ef4bd824d6f7726174082b7a /src
parent4b17214aab5d108a2b9b060e49ef6a27d43d35b4 (diff)
downloademacs-3fc36f427a6dfe5366fd1391fee1d037a1bd6cd7.tar.gz
emacs-3fc36f427a6dfe5366fd1391fee1d037a1bd6cd7.zip
Avoid args-out-of-range errors on fringe clicks after "C-h k"
* src/keyboard.c (echo_truncate): Don't call Ftruncate if the echo message is already shorter than NCHARS. (Bug#27040)
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index c9fa2a9f5e1..55486c6d9ab 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -634,7 +634,8 @@ echo_length (void)
634static void 634static void
635echo_truncate (ptrdiff_t nchars) 635echo_truncate (ptrdiff_t nchars)
636{ 636{
637 if (STRINGP (KVAR (current_kboard, echo_string))) 637 Lisp_Object es = KVAR (current_kboard, echo_string);
638 if (STRINGP (es) && SCHARS (es) > nchars)
638 kset_echo_string (current_kboard, 639 kset_echo_string (current_kboard,
639 Fsubstring (KVAR (current_kboard, echo_string), 640 Fsubstring (KVAR (current_kboard, echo_string),
640 make_number (0), make_number (nchars))); 641 make_number (0), make_number (nchars)));