Commit 633bb8a9 authored by Luc Teirlinck's avatar Luc Teirlinck
Browse files

(custom-buffer-create-internal): State in the text above

the whole buffer buttons that they do not operate on hidden items.
(custom-face-menu): Use `custom-face-save' instead of
`custom-face-save-command'.
(custom-face-save-command): Make it an alias for `custom-face-save'
and declare it obsolete.
(custom-face-save): Doc fix.
parent 4151840f
...@@ -1485,7 +1485,8 @@ See ") ...@@ -1485,7 +1485,8 @@ See ")
:help-echo "Read the online help." :help-echo "Read the online help."
"(emacs)Easy Customization") "(emacs)Easy Customization")
(widget-insert " for more information.\n\n") (widget-insert " for more information.\n\n")
(widget-insert "Operate on everything in this buffer:\n ")) (widget-insert "Operate on all settings in this buffer that \
are not marked HIDDEN:\n "))
(widget-insert " ")) (widget-insert " "))
(widget-create 'push-button (widget-create 'push-button
:tag "Set for Current Session" :tag "Set for Current Session"
...@@ -3323,7 +3324,7 @@ SPEC must be a full face spec." ...@@ -3323,7 +3324,7 @@ SPEC must be a full face spec."
(defvar custom-face-menu (defvar custom-face-menu
`(("Set for Current Session" custom-face-set) `(("Set for Current Session" custom-face-set)
,@(when (or custom-file user-init-file) ,@(when (or custom-file user-init-file)
'(("Save for Future Sessions" custom-face-save-command))) '(("Save for Future Sessions" custom-face-save)))
("Undo Edits" custom-redraw ("Undo Edits" custom-redraw
(lambda (widget) (lambda (widget)
(memq (widget-get widget :custom-state) '(modified changed)))) (memq (widget-get widget :custom-state) '(modified changed))))
...@@ -3448,13 +3449,8 @@ Optional EVENT is the location for the menu." ...@@ -3448,13 +3449,8 @@ Optional EVENT is the location for the menu."
(custom-face-state-set widget) (custom-face-state-set widget)
(custom-redraw-magic widget))) (custom-redraw-magic widget)))
(defun custom-face-save-command (widget)
"Save in `.emacs' the face attributes in WIDGET."
(custom-face-save widget)
(custom-save-all))
(defun custom-face-save (widget) (defun custom-face-save (widget)
"Prepare for saving WIDGET's face attributes, but don't write `.emacs'." "Save in `.emacs' the face attributes in WIDGET."
(let* ((symbol (widget-value widget)) (let* ((symbol (widget-value widget))
(child (car (widget-get widget :children))) (child (car (widget-get widget :children)))
(value (custom-post-filter-face-spec (widget-value child))) (value (custom-post-filter-face-spec (widget-value child)))
...@@ -3480,6 +3476,10 @@ Optional EVENT is the location for the menu." ...@@ -3480,6 +3476,10 @@ Optional EVENT is the location for the menu."
(custom-face-state-set widget) (custom-face-state-set widget)
(custom-redraw-magic widget))) (custom-redraw-magic widget)))
;; For backward compatibility.
(define-obsolete-function-alias 'custom-face-save-command 'custom-face-save
"22.1")
(defun custom-face-reset-saved (widget) (defun custom-face-reset-saved (widget)
"Restore WIDGET to the face's default attributes." "Restore WIDGET to the face's default attributes."
(let* ((symbol (widget-value widget)) (let* ((symbol (widget-value widget))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment