Mercurial > emacs

changeset 35040:604d4b3d1054

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set_font_frame_param): Don't do anything for non-graphical frames.
author Gerd Moellmann <gerd@gnu.org>
date Thu, 04 Jan 2001 13:03:34 +0000
parents 14c95b31ec71
children bc813ec7a28d
files src/xfaces.c
diffstat 1 files changed, 21 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Thu Jan 04 12:53:51 2001 +0000
+++ b/src/xfaces.c	Thu Jan 04 13:03:34 2001 +0000
@@ -4197,24 +4197,28 @@
      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
-    {
-      /* 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);
-    }
+
+  if (FRAME_WINDOW_P (f))
+    {
+      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));
+    }
 }