From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 16 Nov 2005 22:15:07 +0000 (+0000)
Subject: (Custom-reset-standard): Verify that
X-Git-Tag: emacs-pretest-22.0.90~5836
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49698bb717f90207c41a3c7bba60ce728b7b5e56;p=emacs.git

(Custom-reset-standard): Verify that
:custom-standard-value prop exists before calling it.

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

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0bd2e9bc5a8..63a0f388f56 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -799,7 +799,8 @@ making them as if they had never been customized at all."
   (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 @@ restoring it to the state of a face that has never been customized."
 
 (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