Mercurial > emacs

changeset 36481:8456d3257f81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Finternal_set_lisp_face_attribute) [!HAVE_WINDOW_SYSTEM]: Record the new attribute in the frame's parameters alist.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 02 Mar 2001 13:30:40 +0000
parents 59455f09babf
children 3df7026fc965
files src/xfaces.c
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Fri Mar 02 12:57:16 2001 +0000
+++ b/src/xfaces.c	Fri Mar 02 13:30:40 2001 +0000
@@ -4064,8 +4064,6 @@
       ++windows_or_buffers_changed;
     }
 
-#ifdef HAVE_WINDOW_SYSTEM
-
   if (!UNSPECIFIEDP (value)
       && NILP (Fequal (old_value, value)))
     {
@@ -4075,16 +4073,21 @@
 
       if (EQ (face, Qdefault))
 	{
+#ifdef HAVE_WINDOW_SYSTEM
 	  /* Changed font-related attributes of the `default' face are
 	     reflected in changed `font' frame parameters. */
 	  if ((font_related_attr_p || font_attr_p)
 	      && lface_fully_specified_p (XVECTOR (lface)->contents))
 	    set_font_frame_param (frame, lface);
-	  else if (EQ (attr, QCforeground))
+	  else
+#endif /* HAVE_WINDOW_SYSTEM */
+
+	  if (EQ (attr, QCforeground))
 	    param = Qforeground_color;
 	  else if (EQ (attr, QCbackground))
 	    param = Qbackground_color;
 	}
+#ifdef HAVE_WINDOW_SYSTEM
 #ifndef WINDOWSNT
       else if (EQ (face, Qscroll_bar))
 	{
@@ -4117,6 +4120,7 @@
 	  if (EQ (attr, QCbackground))
 	    param = Qmouse_color;
 	}
+#endif /* HAVE_WINDOW_SYSTEM */
       else if (EQ (face, Qmenu))
 	++menu_face_change_count;
 
@@ -4137,8 +4141,6 @@
 	  }
     }
 
-#endif /* HAVE_WINDOW_SYSTEM */
-
   return face;
 }