# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1194597890 0
# Node ID 81b93e70cbb0b79598b35f00f4f2433f1f904f2d
# Parent  7ecf8a0d7db4658a25ea7e160f94e20df2dbb738
(face-normalize-spec): Remove function.
(frame-set-background-mode): Undo last change.

diff -r 7ecf8a0d7db4 -r 81b93e70cbb0 lisp/faces.el
--- a/lisp/faces.el	Fri Nov 09 03:19:27 2007 +0000
+++ b/lisp/faces.el	Fri Nov 09 08:44:50 2007 +0000
@@ -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