From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 2 Jan 2006 03:43:35 +0000 (+0000)
Subject: Fix previous change.
X-Git-Tag: emacs-pretest-22.0.90~4937
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b8919739a69b884caf9354d2b6d993b7b2d1dbfd;p=emacs.git

Fix previous change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b254c481a12..1050d3deb84 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,7 +2,7 @@
 
 	* cus-edit.el (Custom-set, Custom-save): Ask for confirmation.
 	(Custom-reset-current, Custom-reset-saved): Likewise.
-	(Custom-reset-standard): Likewise.
+	(Custom-reset-standard): Show message if aborted.
 	(custom-mode): Doc fix, describing those commands.
 
 	* mouse.el (mouse-drag-region-1): When following link via mouse-2,
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 55b739b9b4b..4c92034eaad 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -815,21 +815,20 @@ The immediate result is to restore them to their standard values.
 This operation eliminates any saved values for the group members,
 making them as if they had never been customized at all."
   (interactive)
-  (if (yes-or-no-p "Eliminate saved values for all settings in this buffer? ")
-      (let ((children custom-options))
-	(when (or (and (= 1 (length children))
-		       (memq (widget-type (car children))
-			     '(custom-variable custom-face)))
-		  (yes-or-no-p "Really erase all customizations in this buffer? "))
-	  (mapc (lambda (widget)
-		  (and (if (widget-get widget :custom-standard-value)
-			   (widget-apply widget :custom-standard-value)
-			 t)
-		       (memq (widget-get widget :custom-state)
-			     '(modified set changed saved rogue))
-		       (widget-apply widget :custom-reset-standard)))
-		children)))
-    (message "Aborted")))
+  (let ((children custom-options))
+    (if (or (and (= 1 (length children))
+		 (memq (widget-type (car children))
+		       '(custom-variable custom-face)))
+	    (yes-or-no-p "Really erase all customizations in this buffer? "))
+	(mapc (lambda (widget)
+		(and (if (widget-get widget :custom-standard-value)
+			 (widget-apply widget :custom-standard-value)
+		       t)
+		     (memq (widget-get widget :custom-state)
+			   '(modified set changed saved rogue))
+		     (widget-apply widget :custom-reset-standard)))
+	      children)
+      (message "Aborted"))))
 
 ;;; The Customize Commands