aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2000-12-06 01:13:15 +0000
committerMiles Bader2000-12-06 01:13:15 +0000
commit0eb2ecde6796e4119b0f674983871ca68a05fad0 (patch)
treeba6b4bc1a5b2b47741c9019efad7ba515dd6bf16 /src
parent4f116dd4f70ea0acb25abbbd2446f56fb501b251 (diff)
downloademacs-0eb2ecde6796e4119b0f674983871ca68a05fad0.tar.gz
emacs-0eb2ecde6796e4119b0f674983871ca68a05fad0.zip
(Finternal_set_lisp_face_attribute): If FRAME is `t', update
`default-frame-alist' instead of setting no frame parameters.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfaces.c24
2 files changed, 20 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8df7fe71400..a3d3a31d4c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-12-06 Miles Bader <miles@gnu.org>
2
3 * xfaces.c (Finternal_set_lisp_face_attribute): If FRAME is `t',
4 update `default-frame-alist' instead of setting no frame parameters.
5
12000-12-06 Kenichi Handa <handa@etl.go.jp> 62000-12-06 Kenichi Handa <handa@etl.go.jp>
2 7
3 * composite.c (update_compositions): Fix typo (use the correct 8 * composite.c (update_compositions): Fix typo (use the correct
diff --git a/src/xfaces.c b/src/xfaces.c
index cad7c072502..b6dfaed745b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4080,8 +4080,7 @@ FRAME 0 means change the face on all frames, and change the default\n\
4080 4080
4081#ifdef HAVE_WINDOW_SYSTEM 4081#ifdef HAVE_WINDOW_SYSTEM
4082 4082
4083 if (!EQ (frame, Qt) 4083 if (!UNSPECIFIEDP (value)
4084 && !UNSPECIFIEDP (value)
4085 && NILP (Fequal (old_value, value))) 4084 && NILP (Fequal (old_value, value)))
4086 { 4085 {
4087 Lisp_Object param; 4086 Lisp_Object param;
@@ -4136,13 +4135,20 @@ FRAME 0 means change the face on all frames, and change the default\n\
4136 ++menu_face_change_count; 4135 ++menu_face_change_count;
4137 4136
4138 if (!NILP (param)) 4137 if (!NILP (param))
4139 { 4138 if (EQ (frame, Qt))
4140 Lisp_Object cons; 4139 /* Update `default-frame-alist', which is used for new frames. */
4141 cons = XCAR (Vparam_value_alist); 4140 {
4142 XCAR (cons) = param; 4141 store_in_alist (&Vdefault_frame_alist, param, value);
4143 XCDR (cons) = value; 4142 }
4144 Fmodify_frame_parameters (frame, Vparam_value_alist); 4143 else
4145 } 4144 /* Update the current frame's parameters. */
4145 {
4146 Lisp_Object cons;
4147 cons = XCAR (Vparam_value_alist);
4148 XCAR (cons) = param;
4149 XCDR (cons) = value;
4150 Fmodify_frame_parameters (frame, Vparam_value_alist);
4151 }
4146 } 4152 }
4147 4153
4148#endif /* HAVE_WINDOW_SYSTEM */ 4154#endif /* HAVE_WINDOW_SYSTEM */