[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117428: Fix bug #18162 with assertion violations
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-24 r117428: Fix bug #18162 with assertion violations due to empty face cache. |
Date: |
Thu, 07 Aug 2014 15:18:51 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117428
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18162
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-08-07 18:18:10 +0300
message:
Fix bug #18162 with assertion violations due to empty face cache.
src/fontset.c (Finternal_char_font): Recompute basic faces if the
frame's face cache was cleared.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/fontset.c fontset.c-20091113204419-o5vbwnq5f7feedwu-1079
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-08-05 06:04:38 +0000
+++ b/src/ChangeLog 2014-08-07 15:18:10 +0000
@@ -1,3 +1,8 @@
+2014-08-07 Eli Zaretskii <address@hidden>
+
+ * fontset.c (Finternal_char_font): Recompute basic faces if the
+ frame's face cache was cleared. (Bug#18162)
+
2014-08-05 Dmitry Antipov <address@hidden>
Fix bug with uninitialized undo list of an indirect buffer (Bug#18180).
=== modified file 'src/fontset.c'
--- a/src/fontset.c 2014-01-01 07:43:34 +0000
+++ b/src/fontset.c 2014-08-07 15:18:10 +0000
@@ -1860,6 +1860,10 @@
return Qnil;
if (!FRAME_WINDOW_P (f))
return Qnil;
+ /* We need the basic faces to be valid below, so recompute them if
+ some code just happened to clear the face cache. */
+ if (FRAME_FACE_CACHE (f)->used == 0)
+ recompute_basic_faces (f);
face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil);
face = FACE_FROM_ID (f, face_id);
if (face->font)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117428: Fix bug #18162 with assertion violations due to empty face cache.,
Eli Zaretskii <=