aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1997-07-05 08:26:04 +0000
committerRichard M. Stallman1997-07-05 08:26:04 +0000
commita367641fe02367ec7d90caeeec2d87427b3135f2 (patch)
treebd4c8d235a73350a694b59993aac35373dc2de5e /src
parent4d3f5d9ab7e23f62c40d98f0b837a41a3a9273bb (diff)
downloademacs-a367641fe02367ec7d90caeeec2d87427b3135f2.tar.gz
emacs-a367641fe02367ec7d90caeeec2d87427b3135f2.zip
(x_set_font): Funcall Qface_set_after_frame_default.
(Qface_set_after_frame_default): New variable. (syms_of_xfns): Initialize and staticpro it.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xfns.c b/src/xfns.c
index cff116dbc1d..4d624b07097 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -211,6 +211,7 @@ extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
211 211
212extern Lisp_Object Vwindow_system_version; 212extern Lisp_Object Vwindow_system_version;
213 213
214Lisp_Object Qface_set_after_frame_default;
214 215
215/* Error if we are not connected to X. */ 216/* Error if we are not connected to X. */
216void 217void
@@ -1592,6 +1593,7 @@ x_set_font (f, arg, oldval)
1592{ 1593{
1593 Lisp_Object result; 1594 Lisp_Object result;
1594 Lisp_Object fontset_name; 1595 Lisp_Object fontset_name;
1596 Lisp_Object frame;
1595 1597
1596 CHECK_STRING (arg, 1); 1598 CHECK_STRING (arg, 1);
1597 1599
@@ -1614,6 +1616,9 @@ x_set_font (f, arg, oldval)
1614 } 1616 }
1615 else 1617 else
1616 abort (); 1618 abort ();
1619
1620 XSETFRAME (frame, f);
1621 call1 (Qface_set_after_frame_default, frame);
1617} 1622}
1618 1623
1619void 1624void
@@ -5251,6 +5256,9 @@ syms_of_xfns ()
5251 staticpro (&Qdisplay); 5256 staticpro (&Qdisplay);
5252 /* This is the end of symbol initialization. */ 5257 /* This is the end of symbol initialization. */
5253 5258
5259 Qface_set_after_frame_default = intern ("face-set-after-frame-default");
5260 staticpro (&Qface_set_after_frame_default);
5261
5254 Fput (Qundefined_color, Qerror_conditions, 5262 Fput (Qundefined_color, Qerror_conditions,
5255 Fcons (Qundefined_color, Fcons (Qerror, Qnil))); 5263 Fcons (Qundefined_color, Fcons (Qerror, Qnil)));
5256 Fput (Qundefined_color, Qerror_message, 5264 Fput (Qundefined_color, Qerror_message,