(set_font_frame_param): Don't do anything for

non-graphical frames.

diff --git a/src/ChangeLog b/src/ChangeLog
index 38ddb31ee932dbace77c2da0c19bad2aa5b8412f..44ae4668455ef6be26317a4d167932ce39106c79 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-04  Gerd Moellmann  <gerd@gnu.org>
 
+       * xfaces.c (set_font_frame_param): Don't do anything for
+       non-graphical frames.
+
        * window.c (Fdelete_other_windows): Set window's window_end_valid
        to nil when changing the window's start.  Don't change the
        window's start when its top position hasn't changed.  If we do,

diff --git a/src/xfaces.c b/src/xfaces.c
index c510885254b199c568e8432b521ab3b2a7439ce4..65f912ef24d95a53a9b68276417d5ff6bdb2f419 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4197,24 +4197,28 @@ set_font_frame_param (frame, lface)
      Lisp_Object frame, lface;
 {
   struct frame *f = XFRAME (frame);
-  Lisp_Object font_name;
-  char *font;
 
-  if (STRINGP (LFACE_FONT (lface)))
-    font_name = LFACE_FONT (lface);
-  else
+  if (FRAME_WINDOW_P (f))
     {
-      /* Choose a font name that reflects LFACE's attributes and has
-        the registry and encoding pattern specified in the default
-        fontset (3rd arg: -1) for ASCII characters (4th arg: 0).  */
-      font = choose_face_font (f, XVECTOR (lface)->contents, -1, 0);
-      if (!font)
-       error ("No font matches the specified attribute");
-      font_name = build_string (font);
-      xfree (font);
-    }
+      Lisp_Object font_name;
+      char *font;
+      
+      if (STRINGP (LFACE_FONT (lface)))
+       font_name = LFACE_FONT (lface);
+      else
+       {
+         /* Choose a font name that reflects LFACE's attributes and has
+            the registry and encoding pattern specified in the default
+            fontset (3rd arg: -1) for ASCII characters (4th arg: 0).  */
+         font = choose_face_font (f, XVECTOR (lface)->contents, -1, 0);
+         if (!font)
+           error ("No font matches the specified attribute");
+         font_name = build_string (font);
+         xfree (font);
+       }
   
-  Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name), Qnil));
+      Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name), Qnil));
+    }
 }