[Emacs-diffs] Changes to emacs/lisp/faces.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/06/28 15:53:08

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -b -r1.415 -r1.416
--- faces.el    25 Jun 2008 22:35:37 -0000      1.415
+++ faces.el    28 Jun 2008 15:53:07 -0000      1.416
@@ -566,9 +566,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(defvar inhibit-face-set-after-frame-default nil
-  "If non-nil, that tells `face-set-after-frame-default' to do nothing.")
-
 (defun set-face-attribute (face frame &rest args)
   "Set attributes of FACE on FRAME from ARGS.
 
@@ -708,7 +705,6 @@
     (while args
       ;; Don't recursively set the attributes from the frame's font param
       ;; when we update the frame's font param from the attributes.
-      (let ((inhibit-face-set-after-frame-default t))
        (if (and (eq (car args) :family)
                 (stringp (cadr args))
                 (string-match "\\([^-]*\\)-\\([^-]*\\)" (cadr args)))
@@ -722,7 +718,7 @@
                                                where))
          (internal-set-lisp-face-attribute face (car args)
                                            (purecopy (cadr args))
-                                           where)))
+                                         where))
       (setq args (cdr (cdr args))))))
 
 
@@ -2005,7 +2001,6 @@
 (defun face-set-after-frame-default (frame)
   "Set frame-local faces of FRAME from face specs and resources.
 Initialize colors of certain faces from frame parameters."
-  (unless inhibit-face-set-after-frame-default
     (if (face-attribute 'default :font t)
        (set-face-attribute 'default frame :font
                            (face-attribute 'default :font t))
@@ -2018,7 +2013,7 @@
       (set-face-attribute 'default frame :weight
                          (face-attribute 'default :weight t))
       (set-face-attribute 'default frame :width
-                         (face-attribute 'default :width t))))
+                       (face-attribute 'default :width t)))
   ;; Find attributes that should be initialized from frame parameters.
   (let ((face-params '((foreground-color default :foreground)
                       (background-color default :background)