# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1132179307 0
# Node ID 1710aca8150ffd02c7204dfb4b17b0dc40050b38
# Parent  504ff72dadfe1946d873660627fbe9907d6a73ae
(Custom-reset-standard): Verify that
:custom-standard-value prop exists before calling it.

(face): Enclose %t in %{...%}.

diff -r 504ff72dadfe -r 1710aca8150f lisp/cus-edit.el
--- a/lisp/cus-edit.el	Wed Nov 16 22:12:20 2005 +0000
+++ b/lisp/cus-edit.el	Wed Nov 16 22:15:07 2005 +0000
@@ -799,7 +799,8 @@
   (interactive)
   (let ((children custom-options))
     (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)
 			   '(modified set changed saved rogue))
 		     (widget-apply widget :custom-reset-standard))))
@@ -3397,7 +3398,7 @@
 
 (define-widget 'face 'symbol
   "A Lisp face name (with sample)."
-  :format "%t: (%{sample%}) %v"
+  :format "%{%t%}: (%{sample%}) %v"
   :tag "Face"
   :value 'default
   :sample-face-get 'widget-face-sample-face-get