(customize-browse): Reword the top-of-buffer help intro.

(custom-buffer-create-internal): Fix previous change.

2 files changed, 25 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1aeb8df4fcc..549f4b946c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-22  Richard M. Stallman  <rms@gnu.org>
+
+        * cus-edit.el (customize-browse): Reword the top-of-buffer help intro.
+        (custom-buffer-create-internal): Fix previous change.
+
+2005-12-22  Richard M. Stallman  <rms@gnu.org>
+        
+        * cus-edit.el (custom-variable-prompt): Say "variable" in prompt.
+        (custom-buffer-create-internal): Reword the top-of-buffer help intro.
+        Don't include buttons that write a file when there's no file.
+        (custom-variable-menu, custom-face-menu, custom-group-menu):
+        Don't include commands that write a file when there's no file.
+
 2005-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * font-lock.el (font-lock-default-fontify-buffer): Try and set-defaults
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index cfdb91a2ea4..c968770043c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1430,14 +1430,14 @@ Otherwise use brackets."
         (if description
             (widget-insert description))
         (widget-insert (format ".
-%s indicate buttons; type RET or click mouse-1 to actuate one.
+%s buttons; type RET or click mouse-1 to actuate one.
 Editing a setting changes only the text in the buffer.
 Use the setting's State button to set it or save changes in it.
 Saving a change normally works by editing your Emacs init file.
 See "
                                (if custom-raised-buttons
-                                   "`Raised' buttons"
-                                 "Square brackets")))
+                                   "`Raised' text indicates"
+                                 "Square brackets indicate")))
         (widget-create 'info-link
                        :tag "Custom file"
                        "(emacs)Saving Customizations")
@@ -1562,10 +1562,15 @@ Un-customize all settings in this buffer--save them with standard values."
   (let ((name "*Customize Browser*"))
     (pop-to-buffer (custom-get-fresh-buffer name)))
   (custom-mode)
-  (widget-insert "\
-Square brackets show active fields; type RET or click mouse-1
-on an active field to invoke its action.
-Invoke [+] below to expand a group, and [-] to collapse an expanded group.\n")
+  (widget-insert (format "\
+%s buttons; type RET or click mouse-1
+on a button to invoke its action.
+Invoke [+] to expand a group, and [-] to collapse an expanded group.\n"
+                         (if custom-raised-buttons
+                             "`Raised' text indicates"
+                           "Square brackets indicate")))
+
+
   (if custom-browse-only-groups
       (widget-insert "\
 Invoke the [Group] button below to edit that item in another window.\n\n")