# HG changeset patch
# User didierv
# Date 987617928 0
# Node ID 6a8b2ec80a198445d5bac3eb395879518819711a
# Parent  f42052c80e1cf879c44d5bcd8ba5de4577ee7164
[xemacs-hg @ 2001-04-18 18:18:46 by didierv]
Custom-reset-standard fix

diff -r f42052c80e1c -r 6a8b2ec80a19 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Apr 18 17:17:55 2001 +0000
+++ b/lisp/ChangeLog	Wed Apr 18 18:18:48 2001 +0000
@@ -1,3 +1,9 @@
+2001-04-18  Didier Verna  <didier@xemacs.org>
+
+	* cus-edit.el (Custom-reset-standard): reset to standard settings
+	not only when the buffer's :custom-state is 'modified, but also
+	when it is 'set or 'saved.
+
 2001-04-18  Martin Buchholz  <martin@xemacs.org>
 
 	* XEmacs 21.5.0 "alfalfa" is released.
diff -r f42052c80e1c -r 6a8b2ec80a19 lisp/cus-edit.el
--- a/lisp/cus-edit.el	Wed Apr 18 17:17:55 2001 +0000
+++ b/lisp/cus-edit.el	Wed Apr 18 18:18:48 2001 +0000
@@ -304,7 +304,7 @@
 		obarray (lambda (symbol)
 			  (and (boundp symbol)
 			       (or (get symbol 'custom-type)
-				   (user-variable-p symbol)))) 
+				   (user-variable-p symbol))))
                 t nil nil (and v (symbol-name v))))
      (list (if (equal val "")
 	       (if (symbolp v) v nil)
@@ -612,7 +612,7 @@
   (interactive)
   (let ((children custom-options))
     (mapc (lambda (child)
-	    (when (eq (widget-get child :custom-state) 'modified)
+	    (when (memq (widget-get child :custom-state) '(modified set saved))
 	      (widget-apply child :custom-reset-standard)))
 	  children)))