diff options
| author | Miles Bader <miles@gnu.org> | 2008-01-02 04:13:39 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-01-02 04:13:39 +0000 |
| commit | 43a8b8ca5797923a7a9848a513ecc8cfff655e17 (patch) | |
| tree | 1fcd51822e01c6017347954e46b788faa2bf728f /lisp/cus-face.el | |
| parent | e97d3ec0184763b2479224486e70d23f03bd340f (diff) | |
| parent | aacde24f5cdebc6d7ccb2f50a9d8e413906c4497 (diff) | |
| download | emacs-43a8b8ca5797923a7a9848a513ecc8cfff655e17.tar.gz | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-308
Diffstat (limited to 'lisp/cus-face.el')
| -rw-r--r-- | lisp/cus-face.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 92274dcbe21..dfc5babec84 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -46,7 +46,7 @@ (make-empty-face face) ;; Create frame-local faces (dolist (frame (frame-list)) - (face-spec-set face value frame) + (face-spec-set-2 face frame value) (when (memq (window-system frame) '(x w32 mac)) (setq have-window-system t))) ;; When making a face after frames already exist @@ -342,7 +342,8 @@ FACE's list property `theme-face' \(using `custom-push-theme')." (unless (facep face) (make-empty-face face)) (put face 'face-comment comment) - (face-spec-set face spec nil)) + (put face 'face-override-spec nil) + (face-spec-set face spec t)) (setq args (cdr args))) ;; Old format, a plist of FACE SPEC pairs. (let ((face (nth 0 args)) |