[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110948: Fix assertion violations
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110948: Fix assertion violations when clicking on Info bread-crumbs. |
Date: |
Sat, 24 Nov 2012 09:25:52 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110948
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-11-24 09:25:52 +0200
message:
Fix assertion violations when clicking on Info bread-crumbs.
src/xdisp.c (draw_glyphs): Don't draw in mouse face if mouse
highlighting on the frame was cleared. Prevents assertion
violations when repeatedly clicking on the "Top" link of the
"bread-crumbs" in Info buffers.
modified:
src/ChangeLog
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-11-24 06:24:13 +0000
+++ b/src/ChangeLog 2012-11-24 07:25:52 +0000
@@ -1,3 +1,10 @@
+2012-11-24 Eli Zaretskii <address@hidden>
+
+ * xdisp.c (draw_glyphs): Don't draw in mouse face if mouse
+ highlighting on the frame was cleared. Prevents assertion
+ violations when repeatedly clicking on the "Top" link of the
+ "bread-crumbs" in Info buffers.
+
2012-11-23 Paul Eggert <address@hidden>
Eli Zaretskii <address@hidden>
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-11-23 08:27:05 +0000
+++ b/src/xdisp.c 2012-11-24 07:25:52 +0000
@@ -23512,7 +23512,9 @@
/* If mouse highlighting is on, we may need to draw adjacent
glyphs using mouse-face highlighting. */
- if (area == TEXT_AREA && row->mouse_face_p)
+ if (area == TEXT_AREA && row->mouse_face_p
+ && hlinfo->mouse_face_beg_row >= 0
+ && hlinfo->mouse_face_end_row >= 0)
{
struct glyph_row *mouse_beg_row, *mouse_end_row;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r110948: Fix assertion violations when clicking on Info bread-crumbs.,
Eli Zaretskii <=