Commit 49698bb7 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(Custom-reset-standard): Verify that

:custom-standard-value prop exists before calling it.

(face): Enclose %t in %{...%}.
parent 73cae835
...@@ -799,7 +799,8 @@ making them as if they had never been customized at all." ...@@ -799,7 +799,8 @@ making them as if they had never been customized at all."
(interactive) (interactive)
(let ((children custom-options)) (let ((children custom-options))
(mapc (lambda (widget) (mapc (lambda (widget)
(and (widget-apply widget :custom-standard-value) (and (widget-get widget :custom-standard-value)
(widget-apply widget :custom-standard-value)
(if (memq (widget-get widget :custom-state) (if (memq (widget-get widget :custom-state)
'(modified set changed saved rogue)) '(modified set changed saved rogue))
(widget-apply widget :custom-reset-standard)))) (widget-apply widget :custom-reset-standard))))
...@@ -3397,7 +3398,7 @@ restoring it to the state of a face that has never been customized." ...@@ -3397,7 +3398,7 @@ restoring it to the state of a face that has never been customized."
(define-widget 'face 'symbol (define-widget 'face 'symbol
"A Lisp face name (with sample)." "A Lisp face name (with sample)."
:format "%t: (%{sample%}) %v" :format "%{%t%}: (%{sample%}) %v"
:tag "Face" :tag "Face"
:value 'default :value 'default
:sample-face-get 'widget-face-sample-face-get :sample-face-get 'widget-face-sample-face-get
......
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