(Custom-set, Custom-save): Doc fix.

(Custom-reset-current, Custom-reset-saved): Change question text.
(Custom-reset-standard): Likewise.
(custom-variable-reset-saved): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59f1a820ed728b5a01d5370d7d1612ac422ff858..b6dc65427a7c21c15293e35e83b7e12f442d60cf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-07  Richard M. Stallman  <rms@gnu.org>
+
+       * cus-edit.el (Custom-set, Custom-save): Doc fix.
+       (Custom-reset-current, Custom-reset-saved): Change question text.
+       (Custom-reset-standard): Likewise.
+       (custom-variable-reset-saved): Doc fix.
+
 2006-01-07  Eli Zaretskii  <eliz@gnu.org>
 
        * startup.el (init-file-user): Doc fix.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 5a4b499d792126aa78817db5aefd6925375834d0..b82510e0174016c7a93aaac0821632441187fa29 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -744,7 +744,7 @@ groups after non-groups, if nil do not order groups at all."
   "Customization widgets in the current buffer.")
 
 (defun Custom-set ()
-  "Set changes in all modified options."
+  "Set the current value of all edited settings in the buffer."
   (interactive)
   (if (y-or-n-p "Set all values according to this buffer? ")
       (let ((children custom-options))
@@ -755,7 +755,9 @@ groups after non-groups, if nil do not order groups at all."
     (message "Aborted")))
 
 (defun Custom-save ()
-  "Set all modified group members and save them."
+  "Set all edited settings, then save all settings that have been set.
+If a setting was edited and set before, this saves it.
+If a setting was merely edited before, this sets it then saves it."
   (interactive)
   (if (yes-or-no-p "Save all settings in this buffer? ")
       (let ((children custom-options))
@@ -786,9 +788,9 @@ when the action is chosen.")
        (funcall answer))))
 
 (defun Custom-reset-current (&rest ignore)
-  "Reset all modified group members to their current value."
+  "Reset all edited settings in the buffer to show their current values."
   (interactive)
-  (if (y-or-n-p "Reset buffer to show current settings? ")
+  (if (y-or-n-p "Reset all settings' buffer text to show current values? ")
       (let ((children custom-options))
        (mapc (lambda (widget)
                (if (memq (widget-get widget :custom-state)
@@ -798,9 +800,10 @@ when the action is chosen.")
     (message "Aborted")))
 
 (defun Custom-reset-saved (&rest ignore)
-  "Reset all modified or set group members to their saved value."
+  "Reset all edited or set settings in the buffer to their saved value.
+This also shows the saved values in the buffer."
   (interactive)
-  (if (y-or-n-p "Reset all settings to saved values? ")
+  (if (y-or-n-p "Reset all settings (current values and buffer text) to saved values? ")
       (let ((children custom-options))
        (mapc (lambda (widget)
                (if (memq (widget-get widget :custom-state)
@@ -819,7 +822,7 @@ making them as if they had never been customized at all."
     (if (or (and (= 1 (length children))
                 (memq (widget-type (car children))
                       '(custom-variable custom-face)))
-           (yes-or-no-p "Erase all customizations in this buffer? "))
+           (yes-or-no-p "Erase all customizations for settings in this buffer? "))
        (mapc (lambda (widget)
                (and (if (widget-get widget :custom-standard-value)
                         (widget-apply widget :custom-standard-value)
@@ -2783,6 +2786,7 @@ Optional EVENT is the location for the menu."
 
 (defun custom-variable-reset-saved (widget)
   "Restore the saved value for the variable being edited by WIDGET.
+This also updates the buffer to show that value.
 The value that was current before this operation
 becomes the backup value, so you can get it again."
   (let* ((symbol (widget-value widget))