Commit d5fd2c54 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent 353c87f6
2012-05-30 Eli Zaretskii <eliz@gnu.org>
* 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 <cyd@gnu.org> 2012-05-30 Chong Yidong <cyd@gnu.org>
* keymap.c (describe_map_tree): Revert 2011-07-07 change (Bug#1169). * keymap.c (describe_map_tree): Revert 2011-07-07 change (Bug#1169).
......
...@@ -3157,7 +3157,7 @@ handle_stop (struct it *it) ...@@ -3157,7 +3157,7 @@ handle_stop (struct it *it)
onto the stack one more time, which is not onto the stack one more time, which is not
expected by the rest of the code that processes expected by the rest of the code that processes
overlay strings. */ overlay strings. */
|| (it->n_overlay_strings <= 0 || (it->current.overlay_string_index < 0
? !get_overlay_strings_1 (it, 0, 0) ? !get_overlay_strings_1 (it, 0, 0)
: 0)) : 0))
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment