From d5fd2c5421d8335f9e36265fe8eb6224c1ff76dd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 30 May 2012 21:09:17 +0300 Subject: [PATCH] Fix bug #11587 with a crash in an Info buffer under linum-mode. src/xdisp.c (handle_stop): Detect whether we have overlay strings loaded by testing it->current.overlay_string_index to be non-negative, instead of checking whether n_overlay_strings is positive. --- src/ChangeLog | 7 +++++++ src/xdisp.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index d8d14005d1e..489c40a4d4d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-05-30 Eli Zaretskii + + * xdisp.c (handle_stop): Detect whether we have overlay strings + loaded by testing it->current.overlay_string_index to be + non-negative, instead of checking whether n_overlay_strings is + positive. (Bug#11587) + 2012-05-30 Chong Yidong * keymap.c (describe_map_tree): Revert 2011-07-07 change (Bug#1169). diff --git a/src/xdisp.c b/src/xdisp.c index a3227b556a9..6762bf85eb4 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -3157,7 +3157,7 @@ handle_stop (struct it *it) onto the stack one more time, which is not expected by the rest of the code that processes overlay strings. */ - || (it->n_overlay_strings <= 0 + || (it->current.overlay_string_index < 0 ? !get_overlay_strings_1 (it, 0, 0) : 0)) { -- 2.39.5