Mercurial > emacs
changeset 75698:021ab5817b76
(Fmodify_frame_parameters): Don't bind
Qinhibit_default_face_x_resources, which has no effect.
(Qinhibit_default_face_x_resources): Symbol deleted.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 06 Feb 2007 22:43:31 +0000 |
| parents | 08bdbc5a6b1e |
| children | ba8f42055b25 |
| files | src/frame.c |
| diffstat | 1 files changed, 0 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Tue Feb 06 22:42:52 2007 +0000 +++ b/src/frame.c Tue Feb 06 22:43:31 2007 +0000 @@ -71,7 +71,6 @@ Lisp_Object Qvisible; Lisp_Object Qdisplay_type; Lisp_Object Qbackground_mode; -Lisp_Object Qinhibit_default_face_x_resources; Lisp_Object Qx_frame_parameter; Lisp_Object Qx_resource_name; @@ -2269,15 +2268,6 @@ { FRAME_PTR f; register Lisp_Object tail, prop, val; - int count = SPECPDL_INDEX (); - - /* Bind this to t to inhibit initialization of the default face from - X resources in face-set-after-frame-default. If we don't inhibit - this, modifying the `font' frame parameter, for example, while - there is a `default.attributeFont' X resource, won't work, - because `default's font is reset to the value of the X resource - and that resets the `font' frame parameter. */ - specbind (Qinhibit_default_face_x_resources, Qt); if (EQ (frame, Qnil)) frame = selected_frame; @@ -2331,8 +2321,6 @@ call1 (Qframe_set_background_mode, frame); } } - - return unbind_to (count, Qnil); } DEFUN ("frame-char-height", Fframe_char_height, Sframe_char_height, @@ -4102,10 +4090,6 @@ Vdefault_frame_scroll_bars = Qnil; #endif - Qinhibit_default_face_x_resources - = intern ("inhibit-default-face-x-resources"); - staticpro (&Qinhibit_default_face_x_resources); - DEFVAR_LISP ("terminal-frame", &Vterminal_frame, doc: /* The initial frame-object, which represents Emacs's stdout. */);