# HG changeset patch # User Richard M. Stallman # Date 898922641 0 # Node ID e7bd87148368bb4bc3ab1cc04bd23590ad15e090 # Parent a1af8a65983ab501ad5a184d97af25abecfc4233 (Fx_list_fonts): Bring arglist into sync with xfns.c. (x_set_font): Call face-set-after-frame-default. (Qface_set_after_frame_default): New variable. (syms_of_w32fns): Initialize it. diff -r a1af8a65983a -r e7bd87148368 src/w32fns.c --- a/src/w32fns.c Sat Jun 27 04:42:03 1998 +0000 +++ b/src/w32fns.c Sat Jun 27 04:44:01 1998 +0000 @@ -189,6 +189,8 @@ extern Lisp_Object Vwindow_system_version; +Lisp_Object Qface_set_after_frame_default; + extern Lisp_Object last_mouse_scroll_bar; extern int last_mouse_scroll_bar_pos; @@ -2046,6 +2048,7 @@ Lisp_Object arg, oldval; { Lisp_Object result; + Lisp_Object frame; CHECK_STRING (arg, 1); @@ -2064,6 +2067,9 @@ } else abort (); + + XSETFRAME (frame, f); + call1 (Qface_set_after_frame_default, frame); } void @@ -4844,7 +4850,7 @@ } -DEFUN ("x-list-fonts", Fx_list_fonts, Sx_list_fonts, 1, 3, 0, +DEFUN ("x-list-fonts", Fx_list_fonts, Sx_list_fonts, 1, 4, 0, "Return a list of the names of available fonts matching PATTERN.\n\ If optional arguments FACE and FRAME are specified, return only fonts\n\ the same size as FACE on FRAME.\n\ @@ -4859,9 +4865,12 @@ set-face-font.\n\ \n\ Fonts Emacs can't use (i.e. proportional fonts) may or may not be excluded\n\ -even if they match PATTERN and FACE.") - (pattern, face, frame) - Lisp_Object pattern, face, frame; +even if they match PATTERN and FACE.\n\ +\n\ +The optional fourth argument MAXIMUM sets a limit on how many\n\ +fonts to match. The first MAXIMUM fonts are reported.") + (pattern, face, frame, maximum) + Lisp_Object pattern, face, frame, maximum; { int num_fonts; char **names; @@ -5646,6 +5655,9 @@ staticpro (&Qdisplay); /* This is the end of symbol initialization. */ + Qface_set_after_frame_default = intern ("face-set-after-frame-default"); + staticpro (&Qface_set_after_frame_default); + Fput (Qundefined_color, Qerror_conditions, Fcons (Qundefined_color, Fcons (Qerror, Qnil))); Fput (Qundefined_color, Qerror_message,