From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 23 Oct 2001 17:19:21 +0000 (+0000)
Subject: (Finternal_set_lisp_face_attribute)
X-Git-Tag: ttn-vms-21-2-B4~19224
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96fbd2c6127987b4aa9c6e475a65323e4d056521;p=emacs.git

(Finternal_set_lisp_face_attribute)
[HAVE_WINDOW_SYSTEM]: Don't do anything for QCfont unless the
frame is on a windowed display.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index acb5820db83..011cd54fd87 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4043,27 +4043,30 @@ FRAME 0 means change the face on all frames, and change the default
   else if (EQ (attr, QCfont))
     {
 #ifdef HAVE_WINDOW_SYSTEM
-      /* Set font-related attributes of the Lisp face from an
-	 XLFD font name.  */
-      struct frame *f;
-      Lisp_Object tmp;
+      if (FRAME_WINDOW_P (f))
+	{
+	  /* Set font-related attributes of the Lisp face from an XLFD
+	     font name.  */
+	  struct frame *f;
+	  Lisp_Object tmp;
 
-      CHECK_STRING (value, 3);
-      if (EQ (frame, Qt))
-	f = SELECTED_FRAME ();
-      else
-	f = check_x_frame (frame);
+	  CHECK_STRING (value, 3);
+	  if (EQ (frame, Qt))
+	    f = SELECTED_FRAME ();
+	  else
+	    f = check_x_frame (frame);
 
-      /* VALUE may be a fontset name or an alias of fontset.  In such
-         a case, use the base fontset name.  */
-      tmp = Fquery_fontset (value, Qnil);
-      if (!NILP (tmp))
-	value = tmp;
+	  /* VALUE may be a fontset name or an alias of fontset.  In
+	     such a case, use the base fontset name.  */
+	  tmp = Fquery_fontset (value, Qnil);
+	  if (!NILP (tmp))
+	    value = tmp;
 
-      if (!set_lface_from_font_name (f, lface, value, 1, 1))
-	signal_error ("Invalid font or fontset name", value);
+	  if (!set_lface_from_font_name (f, lface, value, 1, 1))
+	    signal_error ("Invalid font or fontset name", value);
 
-      font_attr_p = 1;
+	  font_attr_p = 1;
+	}
 #endif /* HAVE_WINDOW_SYSTEM */
     }
   else if (EQ (attr, QCinherit))