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

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/06/13 02:01:07

Index: faces.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/faces.el,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -b -r1.407 -r1.408
--- faces.el    13 Jun 2008 01:56:55 -0000      1.407
+++ faces.el    13 Jun 2008 02:01:07 -0000      1.408
@@ -2001,25 +2001,17 @@
   "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
-    (or (eq (face-attribute 'default :font t) 'unspecified)
+    (if (face-attribute 'default :font t)
        (set-face-attribute 'default frame :font
-                           (face-attribute 'default :font t)))
-    (or (eq (face-attribute 'default :family t) 'unspecified)
+                           (face-attribute 'default :font t))
        (set-face-attribute 'default frame :family
-                           (face-attribute 'default :family t)))
-    (or (eq (face-attribute 'default :foundry t) 'unspecified)
-       (set-face-attribute 'default frame :foundry
-                           (face-attribute 'default :foundry t)))
-    (or (eq (face-attribute 'default :height t) 'unspecified)
+                         (face-attribute 'default :family t))
        (set-face-attribute 'default frame :height
-                           (face-attribute 'default :height t)))
-    (or (eq (face-attribute 'default :slant t) 'unspecified)
+                         (face-attribute 'default :height t))
        (set-face-attribute 'default frame :slant
-                           (face-attribute 'default :slant t)))
-    (or (eq (face-attribute 'default :weight t) 'unspecified)
+                         (face-attribute 'default :slant t))
        (set-face-attribute 'default frame :weight
-                           (face-attribute 'default :weight t)))
-    (or (eq (face-attribute 'default :width t) 'unspecified)
+                         (face-attribute 'default :weight t))
        (set-face-attribute 'default frame :width
                            (face-attribute 'default :width t))))
   ;; Find attributes that should be initialized from frame parameters.