diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2007-11-09 08:45:13 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2007-11-09 08:45:13 +0000 |
| commit | 9d2185d10e3da9062672d96d3b59fcea31ff17ed (patch) | |
| tree | ecf7ceb98e9d7ab08262051600151883fa80ed40 | |
| parent | 3f2623c37738dd634fd3fa1eb1581b134cbea70c (diff) | |
| download | emacs-9d2185d10e3da9062672d96d3b59fcea31ff17ed.tar.gz | |
(face-normalize-spec): Remove function.
(frame-set-background-mode): Undo last change.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/faces.el | 25 |
2 files changed, 6 insertions, 24 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20f4f7480f6..983fb37c1d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-09 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * faces.el (face-normalize-spec): Remove function. + (frame-set-background-mode): Undo last change. + 2007-11-09 Juanma Barranquero <lekktu@gmail.com> * files.el (enable-local-variables): Doc fix. diff --git a/lisp/faces.el b/lisp/faces.el index f22b79e8fc3..ceadb6f764f 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1505,28 +1505,6 @@ If there is neither a user setting nor a default for FACE, return nil." (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 @@ according to the `background-mode' and `display-type' frame parameters." ;; 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 |