[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src xfaces.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src xfaces.c |
Date: |
Mon, 01 Dec 2008 18:08:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/12/01 18:08:59
Modified files:
src : xfaces.c
Log message:
(realize_x_face): Make abort condition clearer.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&r1=1.419&r2=1.420
Patches:
Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -b -r1.419 -r1.420
--- xfaces.c 27 Nov 2008 20:17:38 -0000 1.419
+++ xfaces.c 1 Dec 2008 18:08:59 -0000 1.420
@@ -5886,9 +5886,12 @@
realizing the default face, thus the default face should have
already been realized. */
if (fontset == -1)
+ {
+ if (default_face)
fontset = default_face->fontset;
if (fontset == -1)
abort ();
+ }
if (! FONT_OBJECT_P (attrs[LFACE_FONT_INDEX]))
attrs[LFACE_FONT_INDEX]
= font_load_for_lface (f, attrs, attrs[LFACE_FONT_INDEX]);
- [Emacs-diffs] emacs/src xfaces.c,
Chong Yidong <=