aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2001-03-02 13:30:40 +0000
committerEli Zaretskii2001-03-02 13:30:40 +0000
commitb9c769f8667ea5fdf99a8875ec798c5d710caff1 (patch)
tree30a64e4fcd7517d3766e88eea1feaba609db0b3f /src
parentcda0f4da7b5289c0e05fd7b6186d8ea28e4eb7ba (diff)
downloademacs-b9c769f8667ea5fdf99a8875ec798c5d710caff1.tar.gz
emacs-b9c769f8667ea5fdf99a8875ec798c5d710caff1.zip
(Finternal_set_lisp_face_attribute)
[!HAVE_WINDOW_SYSTEM]: Record the new attribute in the frame's parameters alist.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 946d9024c9e..b11a7d467de 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4064,8 +4064,6 @@ FRAME 0 means change the face on all frames, and change the default\n\
4064 ++windows_or_buffers_changed; 4064 ++windows_or_buffers_changed;
4065 } 4065 }
4066 4066
4067#ifdef HAVE_WINDOW_SYSTEM
4068
4069 if (!UNSPECIFIEDP (value) 4067 if (!UNSPECIFIEDP (value)
4070 && NILP (Fequal (old_value, value))) 4068 && NILP (Fequal (old_value, value)))
4071 { 4069 {
@@ -4075,16 +4073,21 @@ FRAME 0 means change the face on all frames, and change the default\n\
4075 4073
4076 if (EQ (face, Qdefault)) 4074 if (EQ (face, Qdefault))
4077 { 4075 {
4076#ifdef HAVE_WINDOW_SYSTEM
4078 /* Changed font-related attributes of the `default' face are 4077 /* Changed font-related attributes of the `default' face are
4079 reflected in changed `font' frame parameters. */ 4078 reflected in changed `font' frame parameters. */
4080 if ((font_related_attr_p || font_attr_p) 4079 if ((font_related_attr_p || font_attr_p)
4081 && lface_fully_specified_p (XVECTOR (lface)->contents)) 4080 && lface_fully_specified_p (XVECTOR (lface)->contents))
4082 set_font_frame_param (frame, lface); 4081 set_font_frame_param (frame, lface);
4083 else if (EQ (attr, QCforeground)) 4082 else
4083#endif /* HAVE_WINDOW_SYSTEM */
4084
4085 if (EQ (attr, QCforeground))
4084 param = Qforeground_color; 4086 param = Qforeground_color;
4085 else if (EQ (attr, QCbackground)) 4087 else if (EQ (attr, QCbackground))
4086 param = Qbackground_color; 4088 param = Qbackground_color;
4087 } 4089 }
4090#ifdef HAVE_WINDOW_SYSTEM
4088#ifndef WINDOWSNT 4091#ifndef WINDOWSNT
4089 else if (EQ (face, Qscroll_bar)) 4092 else if (EQ (face, Qscroll_bar))
4090 { 4093 {
@@ -4117,6 +4120,7 @@ FRAME 0 means change the face on all frames, and change the default\n\
4117 if (EQ (attr, QCbackground)) 4120 if (EQ (attr, QCbackground))
4118 param = Qmouse_color; 4121 param = Qmouse_color;
4119 } 4122 }
4123#endif /* HAVE_WINDOW_SYSTEM */
4120 else if (EQ (face, Qmenu)) 4124 else if (EQ (face, Qmenu))
4121 ++menu_face_change_count; 4125 ++menu_face_change_count;
4122 4126
@@ -4137,8 +4141,6 @@ FRAME 0 means change the face on all frames, and change the default\n\
4137 } 4141 }
4138 } 4142 }
4139 4143
4140#endif /* HAVE_WINDOW_SYSTEM */
4141
4142 return face; 4144 return face;
4143} 4145}
4144 4146