emacs: src/xfaces.c comparison

(set_font_frame_param): Don't do anything for non-graphical frames.

comparison

equal deleted inserted replaced

-:14c95b31ec71
+:604d4b3d1054
 static void
 set_font_frame_param (frame, lface)
 Lisp_Object frame, lface;
 {
 struct frame *f = XFRAME (frame);
-Lisp_Object font_name;
-char *font;
+if (FRAME_WINDOW_P (f))
+{
-if (STRINGP (LFACE_FONT (lface)))
+Lisp_Object font_name;
-font_name = LFACE_FONT (lface);
+char *font;
-else
-{
+if (STRINGP (LFACE_FONT (lface)))
-/* Choose a font name that reflects LFACE's attributes and has
+	font_name = LFACE_FONT (lface);
-	 the registry and encoding pattern specified in the default
+else
-	 fontset (3rd arg: -1) for ASCII characters (4th arg: 0).  */
+	{
-font = choose_face_font (f, XVECTOR (lface)->contents, -1, 0);
+	  /* Choose a font name that reflects LFACE's attributes and has
-if (!font)
+	     the registry and encoding pattern specified in the default
-	error ("No font matches the specified attribute");
+	     fontset (3rd arg: -1) for ASCII characters (4th arg: 0).  */
-font_name = build_string (font);
+	  font = choose_face_font (f, XVECTOR (lface)->contents, -1, 0);
-xfree (font);
+	  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));
+}
 }
 /* Update the corresponding face when frame parameter PARAM on frame F
 has been assigned the value NEW_VALUE.  */

Mercurial > emacs