[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104162: Handle calling defface on a
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104162: Handle calling defface on a face with existing theme settings (Bug#8454). |
Date: |
Sun, 08 May 2011 16:07:38 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104162
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-05-08 16:07:38 -0400
message:
Handle calling defface on a face with existing theme settings (Bug#8454).
* lisp/cus-face.el (custom-declare-face): Call custom-theme-recalc-face if
the face has existing theme settings.
modified:
lisp/ChangeLog
lisp/cus-face.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-08 18:34:51 +0000
+++ b/lisp/ChangeLog 2011-05-08 20:07:38 +0000
@@ -1,3 +1,8 @@
+2011-05-08 Chong Yidong <address@hidden>
+
+ * cus-face.el (custom-declare-face): Call custom-theme-recalc-face
+ if the face has existing theme settings (Bug#8454).
+
2011-05-08 Ralph Schleicher <address@hidden>
* progmodes/perl-mode.el (perl-imenu-generic-expression): Only
=== modified file 'lisp/cus-face.el'
--- a/lisp/cus-face.el 2011-04-07 23:59:27 +0000
+++ b/lisp/cus-face.el 2011-05-08 20:07:38 +0000
@@ -34,28 +34,30 @@
(defun custom-declare-face (face spec doc &rest args)
"Like `defface', but FACE is evaluated as a normal argument."
(unless (get face 'face-defface-spec)
- (when (fboundp 'facep)
- (unless (facep face)
- ;; If the user has already created the face, respect that.
- (let ((value (or (get face 'saved-face) spec))
- (have-window-system (memq initial-window-system '(x w32))))
- ;; Create global face.
- (make-empty-face face)
- ;; Create frame-local faces
- (dolist (frame (frame-list))
- (face-spec-set-2 face frame value)
- (when (memq (window-system frame) '(x w32 ns))
- (setq have-window-system t)))
- ;; When making a face after frames already exist
- (if have-window-system
- (make-face-x-resource-internal face)))))
+ (unless (facep face)
+ ;; If the user has already created the face, respect that.
+ (let ((value (or (get face 'saved-face) spec))
+ (have-window-system (memq initial-window-system '(x w32))))
+ ;; Create global face.
+ (make-empty-face face)
+ ;; Create frame-local faces
+ (dolist (frame (frame-list))
+ (face-spec-set-2 face frame value)
+ (when (memq (window-system frame) '(x w32 ns))
+ (setq have-window-system t)))
+ ;; When making a face after frames already exist
+ (if have-window-system
+ (make-face-x-resource-internal face))))
;; Don't record SPEC until we see it causes no errors.
(put face 'face-defface-spec (purecopy spec))
(push (cons 'defface face) current-load-list)
(when (and doc (null (face-documentation face)))
(set-face-documentation face (purecopy doc)))
(custom-handle-all-keywords face args 'custom-face)
- (run-hooks 'custom-define-hook))
+ (run-hooks 'custom-define-hook)
+ ;; If the face has an existing theme setting, recalculate it.
+ (if (get face 'theme-face)
+ (custom-theme-recalc-face face)))
face)
;;; Face attributes.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104162: Handle calling defface on a face with existing theme settings (Bug#8454).,
Chong Yidong <=