mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

Handle calling defface on a face with existing theme settings (Bug#8454).

Browse source 
* lisp/cus-face.el (custom-declare-face): Call custom-theme-recalc-face if
the face has existing theme settings.
This commit is contained in:
Chong Yidong 2011-05-08 16:07:38 -04:00
parent 2a86a00c4f
commit 027f966de4
2 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-05-08 Chong Yidong <cyd@stupidchicken.com>
* 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 <rs@ralph-schleicher.de> 2011-05-08 Ralph Schleicher <rs@ralph-schleicher.de>
* progmodes/perl-mode.el (perl-imenu-generic-expression): Only * progmodes/perl-mode.el (perl-imenu-generic-expression): Only

34
lisp/cus-face.el
View file

@ -34,28 +34,30 @@
(defun custom-declare-face (face spec doc &rest args) (defun custom-declare-face (face spec doc &rest args)
"Like `defface', but FACE is evaluated as a normal argument." "Like `defface', but FACE is evaluated as a normal argument."
(unless (get face 'face-defface-spec) (unless (get face 'face-defface-spec)
(when (fboundp 'facep) (unless (facep face)
(unless (facep face) ;; If the user has already created the face, respect that.
;; If the user has already created the face, respect that. (let ((value (or (get face 'saved-face) spec))
(let ((value (or (get face 'saved-face) spec)) (have-window-system (memq initial-window-system '(x w32))))
(have-window-system (memq initial-window-system '(x w32)))) ;; Create global face.
;; Create global face. (make-empty-face face)
(make-empty-face face) ;; Create frame-local faces
;; Create frame-local faces (dolist (frame (frame-list))
(dolist (frame (frame-list)) (face-spec-set-2 face frame value)
(face-spec-set-2 face frame value) (when (memq (window-system frame) '(x w32 ns))
(when (memq (window-system frame) '(x w32 ns)) (setq have-window-system t)))
(setq have-window-system t))) ;; When making a face after frames already exist
;; When making a face after frames already exist (if have-window-system
(if have-window-system (make-face-x-resource-internal face))))
(make-face-x-resource-internal face)))))
;; Don't record SPEC until we see it causes no errors. ;; Don't record SPEC until we see it causes no errors.
(put face 'face-defface-spec (purecopy spec)) (put face 'face-defface-spec (purecopy spec))
(push (cons 'defface face) current-load-list) (push (cons 'defface face) current-load-list)
(when (and doc (null (face-documentation face))) (when (and doc (null (face-documentation face)))
(set-face-documentation face (purecopy doc))) (set-face-documentation face (purecopy doc)))
(custom-handle-all-keywords face args 'custom-face) (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)
;;; Face attributes. ;;; Face attributes.