From baa15c0bc1b4b8a0d23c0580ac42f6b5cbe853cf Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 6 Feb 2007 22:43:31 +0000 Subject: [PATCH] (Fmodify_frame_parameters): Don't bind Qinhibit_default_face_x_resources, which has no effect. (Qinhibit_default_face_x_resources): Symbol deleted. --- src/frame.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/frame.c b/src/frame.c index c4ba9af176b..c7ec3dda3b4 100644 --- a/src/frame.c +++ b/src/frame.c @@ -71,7 +71,6 @@ Lisp_Object Qx, Qw32, Qmac, Qpc; 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 @@ enabled such bindings for that variable with `make-variable-frame-local'. */) { 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 @@ enabled such bindings for that variable with `make-variable-frame-local'. */) 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 @@ Setting this variable does not affect existing frames, only new ones. */); 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. */); -- 2.11.4.GIT