aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfont.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xfont.c')
-rw-r--r--src/xfont.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xfont.c b/src/xfont.c
index f673adbbd5e..1aface6f972 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -593,9 +593,7 @@ xfont_match (struct frame *f, Lisp_Object spec)
593 { 593 {
594 if (XGetFontProperty (xfont, XA_FONT, &value)) 594 if (XGetFontProperty (xfont, XA_FONT, &value))
595 { 595 {
596 char *s; 596 char *s = XGetAtomName (display, (Atom) value);
597
598 s = (char *) XGetAtomName (display, (Atom) value);
599 597
600 /* If DXPC (a Differential X Protocol Compressor) 598 /* If DXPC (a Differential X Protocol Compressor)
601 Ver.3.7 is running, XGetAtomName will return null 599 Ver.3.7 is running, XGetAtomName will return null
@@ -760,7 +758,7 @@ xfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
760 char *p0, *p; 758 char *p0, *p;
761 int dashes = 0; 759 int dashes = 0;
762 760
763 p0 = p = (char *) XGetAtomName (FRAME_X_DISPLAY (f), (Atom) value); 761 p0 = p = XGetAtomName (FRAME_X_DISPLAY (f), (Atom) value);
764 /* Count the number of dashes in the "full name". 762 /* Count the number of dashes in the "full name".
765 If it is too few, this isn't really the font's full name, 763 If it is too few, this isn't really the font's full name,
766 so don't use it. 764 so don't use it.