[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108024: Fix bug #11587 with a cra
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108024: Fix bug #11587 with a crash in an Info buffer under linum-mode. |
Date: |
Wed, 30 May 2012 21:09:17 +0300 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108024
fixes bug: http://debbugs.gnu.org/11587
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-05-30 21:09:17 +0300
message:
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.
modified:
src/ChangeLog
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-05-30 14:08:58 +0000
+++ b/src/ChangeLog 2012-05-30 18:09:17 +0000
@@ -1,3 +1,10 @@
+2012-05-30 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* keymap.c (describe_map_tree): Revert 2011-07-07 change (Bug#1169).
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-05-19 12:14:11 +0000
+++ b/src/xdisp.c 2012-05-30 18:09:17 +0000
@@ -3157,7 +3157,7 @@
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))
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108024: Fix bug #11587 with a crash in an Info buffer under linum-mode.,
Eli Zaretskii <=