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

[YAMAMOTO Mitsuharu]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     YAMAMOTO Mitsuharu <mituharu>   07/11/09 08:44:50

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.370.2.4
retrieving revision 1.370.2.5
diff -u -b -r1.370.2.4 -r1.370.2.5
--- faces.el    10 Oct 2007 20:18:20 -0000      1.370.2.4
+++ faces.el    9 Nov 2007 08:44:50 -0000       1.370.2.5
@@ -1505,28 +1505,6 @@
       (get face 'saved-face)
       (face-default-spec face)))
 
-(defsubst face-normalize-spec (spec)
-  "Return a normalized face-spec of SPEC."
-  (let (normalized-spec)
-    (while spec
-      (let ((attribute (car spec))
-           (value (car (cdr spec))))
-       ;; Support some old-style attribute names and values.
-       (case attribute
-         (:bold (setq attribute :weight value (if value 'bold 'normal)))
-         (:italic (setq attribute :slant value (if value 'italic 'normal)))
-         ((:foreground :background)
-          ;; Compatibility with 20.x.  Some bogus face specs seem to
-          ;; exist containing things like `:foreground nil'.
-          (if (null value) (setq value 'unspecified)))
-         (t (unless (assq attribute face-x-resources)
-              (setq attribute nil))))
-       (when attribute
-         (push attribute normalized-spec)
-         (push value normalized-spec)))
-      (setq spec (cdr (cdr spec))))
-    (nreverse normalized-spec)))
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Frame-type independent color support.
@@ -1669,8 +1647,7 @@
        ;; be unmodified, so we can avoid consing in the common case.
        (dolist (face (face-list))
          (when (not (face-spec-match-p face
-                                       (face-normalize-spec
-                                        (face-user-default-spec face))
+                                       (face-user-default-spec face)
                                        (selected-frame)))
            (push face locally-modified-faces)))
        ;; Now change to the new frame parameters