[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3fc36f4: Avoid args-out-of-range errors on fringe c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 3fc36f4: Avoid args-out-of-range errors on fringe clicks after "C-h k" |
Date: |
Sat, 27 May 2017 08:58:47 -0400 (EDT) |
branch: master
commit 3fc36f427a6dfe5366fd1391fee1d037a1bd6cd7
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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)
---
src/keyboard.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index c9fa2a9..55486c6 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -634,7 +634,8 @@ echo_length (void)
static void
echo_truncate (ptrdiff_t nchars)
{
- if (STRINGP (KVAR (current_kboard, echo_string)))
+ Lisp_Object es = KVAR (current_kboard, echo_string);
+ if (STRINGP (es) && SCHARS (es) > nchars)
kset_echo_string (current_kboard,
Fsubstring (KVAR (current_kboard, echo_string),
make_number (0), make_number (nchars)));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 3fc36f4: Avoid args-out-of-range errors on fringe clicks after "C-h k",
Eli Zaretskii <=