Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-22 04:47:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

(custom-face-set): Call `face-spec-set' with FOR-DEFFACE.

Browse source 
(custom-face-save): Likewise.
(custom-face-reset-saved, custom-face-reset-standard): Likewise.
This commit is contained in:
Richard M. Stallman 2007-12-30 03:36:05 +00:00
parent af4bbb690b
commit d50e9d5b17
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/ChangeLog
View file

@ -1,3 +1,25 @@
2007-12-30 Richard Stallman <rms@gnu.org>
* cus-edit.el (custom-face-set): Call `face-spec-set' with FOR-DEFFACE.
(custom-face-save): Likewise.
(custom-face-reset-saved, custom-face-reset-standard): Likewise.
* cus-face.el (custom-declare-face): Per frame, use `face-spec-set-2'.
(custom-theme-set-faces): Clear `face-override-spec' property.
Call `face-spec-set' with FOR-DEFFACE.
* custom.el (custom-theme-recalc-face):
Simply call `face-spec-recalc'.
* faces.el (face-spec-set): Third arg is now FOR-DEFFACE.
Use of frame as third arg is deprecated.
Handle `face-override-spec' property.
(face-spec-recalc): New function.
(face-spec-set-2): New function.
(frame-set-background-mode): Handle `face-override-spec' property.
Use `face-spec-recalc'.
(face-set-after-frame-default): Use `face-spec-recalc'.
2007-12-29 Nick Roberts <nickrob@snap.net.nz>
* thumbs.el (thumbs-conversion-program): Add comment for Windows XP.

12
lisp/cus-edit.el
View file

@ -3496,10 +3496,10 @@ Optional EVENT is the location for the menu."
(put symbol 'customized-face value)
(custom-push-theme 'theme-face symbol 'user 'set value)
(if (face-spec-choose value)
(face-spec-set symbol value)
(face-spec-set symbol value t)
;; face-set-spec ignores empty attribute lists, so just give it
;; something harmless instead.
(face-spec-set symbol '((t :foreground unspecified))))
(face-spec-set symbol '((t :foreground unspecified)) t))
(put symbol 'customized-face-comment comment)
(put symbol 'face-comment comment)
(custom-face-state-set widget)
@ -3518,10 +3518,10 @@ Optional EVENT is the location for the menu."
(custom-comment-hide comment-widget))
(custom-push-theme 'theme-face symbol 'user 'set value)
(if (face-spec-choose value)
(face-spec-set symbol value)
(face-spec-set symbol value t)
;; face-set-spec ignores empty attribute lists, so just give it
;; something harmless instead.
(face-spec-set symbol '((t :foreground unspecified))))
(face-spec-set symbol '((t :foreground unspecified)) t))
(unless (eq (widget-get widget :custom-state) 'standard)
(put symbol 'saved-face value))
(put symbol 'customized-face nil)
@ -3548,7 +3548,7 @@ Optional EVENT is the location for the menu."
(put symbol 'customized-face nil)
(put symbol 'customized-face-comment nil)
(custom-push-theme 'theme-face symbol 'user 'set value)
(face-spec-set symbol value)
(face-spec-set symbol value t)
(put symbol 'face-comment comment)
(widget-value-set child value)
;; This call manages the comment visibility
@ -3572,7 +3572,7 @@ restoring it to the state of a face that has never been customized."
(put symbol 'customized-face nil)
(put symbol 'customized-face-comment nil)
(custom-push-theme 'theme-face symbol 'user 'reset)
(face-spec-set symbol value)
(face-spec-set symbol value t)
(custom-theme-recalc-face symbol)
(when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
(put symbol 'saved-face nil)