[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog xftfont.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog xftfont.c |
Date: |
Tue, 30 Jun 2009 22:07:46 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/06/30 22:07:45
Modified files:
src : ChangeLog xftfont.c
Log message:
* xftfont.c (xftfont_open): Avoid passing NULL argument to
XftLockFace.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7615&r2=1.7616
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&r1=1.24&r2=1.25
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7615
retrieving revision 1.7616
diff -u -b -r1.7615 -r1.7616
--- ChangeLog 30 Jun 2009 15:48:24 -0000 1.7615
+++ ChangeLog 30 Jun 2009 22:07:44 -0000 1.7616
@@ -1,3 +1,8 @@
+2009-06-30 Chong Yidong <address@hidden>
+
+ * xftfont.c (xftfont_open): Avoid passing NULL argument to
+ XftLockFace.
+
2009-06-30 Jason Rumney <address@hidden>
* w32term.c (w32_initialize): Use GetModuleHandle for library that
Index: xftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/xftfont.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- xftfont.c 11 May 2009 09:29:49 -0000 1.24
+++ xftfont.c 30 Jun 2009 22:07:45 -0000 1.25
@@ -287,14 +287,15 @@
match = XftFontMatch (display, FRAME_X_SCREEN_NUMBER (f), pat, &result);
FcPatternDestroy (pat);
xftfont = XftFontOpenPattern (display, match);
- ft_face = XftLockFace (xftfont);
- UNBLOCK_INPUT;
-
- if (! xftfont)
+ if (!xftfont)
{
+ UNBLOCK_INPUT;
XftPatternDestroy (match);
return Qnil;
}
+ ft_face = XftLockFace (xftfont);
+ UNBLOCK_INPUT;
+
/* We should not destroy PAT here because it is kept in XFTFONT and
destroyed automatically when XFTFONT is closed. */
font_object = font_make_object (VECSIZE (struct xftfont_info), entity, size);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog xftfont.c,
Chong Yidong <=