diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-05-30 21:09:17 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-05-30 21:09:17 +0300 |
| commit | d5fd2c5421d8335f9e36265fe8eb6224c1ff76dd (patch) | |
| tree | e8f74e1be82fe4bc9ef6dab8b25384e700515a4a | |
| parent | 353c87f6ff3c0834e521563f8eefa75c0b10e388 (diff) | |
| download | emacs-d5fd2c5421d8335f9e36265fe8eb6224c1ff76dd.tar.gz emacs-d5fd2c5421d8335f9e36265fe8eb6224c1ff76dd.tar.bz2 emacs-d5fd2c5421d8335f9e36265fe8eb6224c1ff76dd.zip | |
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.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 8 insertions, 1 deletions
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 <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> * 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)) { |