Mercurial > emacs

changeset 16048:befa11d2da7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_term_init): Initialize Xatom_FONT member. (x_new_font): Use Xatom_FONT member.
author Richard M. Stallman <rms@gnu.org>
date Sun, 01 Sep 1996 20:49:29 +0000
parents 182b9268dbad
children d7eb8b39a84b
files src/xterm.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Sun Sep 01 20:48:03 1996 +0000
+++ b/src/xterm.c	Sun Sep 01 20:49:29 1996 +0000
@@ -4773,7 +4773,6 @@
       char *full_name;
       XFontStruct *font;
       int n_fonts;
-      Atom FONT_atom;
 
       /* Try to find a character-cell font in the list.  */
 #if 0
@@ -4819,10 +4818,9 @@
 
       /* Try to get the full name of FONT.  Put it in full_name.  */
       full_name = 0;
-      FONT_atom = XInternAtom (FRAME_X_DISPLAY (f), "FONT", False);
       for (i = 0; i < font->n_properties; i++)
 	{
-	  if (FONT_atom == font->properties[i].name)
+	  if (FRAME_X_DISPLAY_INFO (f)->Xatom_FONT == font->properties[i].name)
 	    {
 	      char *name = XGetAtomName (FRAME_X_DISPLAY (f),
 					 (Atom) (font->properties[i].card32));
@@ -6043,6 +6041,8 @@
     = XInternAtom (dpyinfo->display, "WM_MOVED", False);
   dpyinfo->Xatom_editres
     = XInternAtom (dpyinfo->display, "Editres", False);
+  dpyinfo->Xatom_FONT
+    = XInternAtom (dpyinfo->display, "FONT", False);
   dpyinfo->Xatom_CLIPBOARD
     = XInternAtom (dpyinfo->display, "CLIPBOARD", False);
   dpyinfo->Xatom_TIMESTAMP