Merge from gnus--rel--5.10

[bpt/emacs.git] / lisp / cus-edit.el

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index d4ea953..e700cd4 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1,7 +1,7 @@
 ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,

-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF


@@ -88,7 +88,7 @@
 ;; compatibility.
 
 ;; You can see (and modify and save) this unevaluated value by selecting
 ;; compatibility.
 
 ;; You can see (and modify and save) this unevaluated value by selecting

-;; "Show initial Lisp expression" from the Lisp interface.  This will
+;; "Show Saved Lisp Expression" from the Lisp interface.  This will

 ;; give you the unevaluated saved value, if any, otherwise the
 ;; unevaluated standard value.
 
 ;; give you the unevaluated saved value, if any, otherwise the
 ;; unevaluated standard value.
 


@@ -121,10 +121,11 @@
 ;; 6. rogue
 
 ;;    There is no standard value.  This means that the variable was
 ;; 6. rogue
 
 ;;    There is no standard value.  This means that the variable was

-;;    not defined with defcustom, nor handled in cus-start.el.  You
-;;    can not create a Custom buffer for such variables using the
-;;    normal interactive Custom commands.  However, such Custom
-;;    buffers can be created in other ways, for instance, by calling
+;;    not defined with defcustom, nor handled in cus-start.el.  Most
+;;    standard interactive Custom commands do not let you create a
+;;    Custom buffer containing such variables.  However, such Custom
+;;    buffers can be created, for instance, by calling
+;;    `customize-apropos' with a prefix arg or by calling

 ;;    `customize-option' non-interactively.
 
 ;; 7. hidden
 ;;    `customize-option' non-interactively.
 
 ;; 7. hidden


@@ -458,22 +459,14 @@
   :link '(custom-manual "(emacs)Windows")
   :group 'environment)
 
   :link '(custom-manual "(emacs)Windows")
   :group 'environment)
 

-;;; Utilities.
+(defgroup mac nil
+  "Mac specific features."
+  :link '(custom-manual "(emacs)Mac OS")
+  :group 'environment
+  :version "22.1"
+  :prefix "mac-")

 
 

-(defun custom-quote (sexp)
-  "Quote SEXP iff it is not self quoting."
-  (if (or (memq sexp '(t nil))
-         (keywordp sexp)
-         (and (listp sexp)
-              (memq (car sexp) '(lambda)))
-         (stringp sexp)
-         (numberp sexp)
-         (vectorp sexp)
-;;;      (and (fboundp 'characterp)
-;;;           (characterp sexp))
-         )
-      sexp
-    (list 'quote sexp)))
+;;; Utilities.

 
 (defun custom-split-regexp-maybe (regexp)
   "If REGEXP is a string, split it to a list at `\\|'.
 
 (defun custom-split-regexp-maybe (regexp)
   "If REGEXP is a string, split it to a list at `\\|'.


@@ -498,8 +491,8 @@ Return a list suitable for use in `interactive'."
          (enable-recursive-minibuffers t)
          val)
      (setq val (completing-read
          (enable-recursive-minibuffers t)
          val)
      (setq val (completing-read

-               (if default (format "Customize option (default %s): " default)
-                 "Customize option: ")
+               (if default (format "Customize variable (default %s): " default)
+                 "Customize variable: ")

                obarray 'custom-variable-p t nil nil default))
      (list (if (equal val "")
               (if (symbolp v) v nil)
                obarray 'custom-variable-p t nil nil default))
      (list (if (equal val "")
               (if (symbolp v) v nil)


@@ -594,6 +587,7 @@ WIDGET is the widget to apply the filter entries of MENU on."
 
 (defcustom custom-guess-name-alist
   '(("-p\\'" boolean)
 
 (defcustom custom-guess-name-alist
   '(("-p\\'" boolean)

+    ("-flag\\'" boolean)

     ("-hook\\'" hook)
     ("-face\\'" face)
     ("-file\\'" file)
     ("-hook\\'" hook)
     ("-face\\'" face)
     ("-file\\'" file)


@@ -611,7 +605,7 @@ used.
 This is used for guessing the type of variables not declared with
 customize."
   :type '(repeat (group (regexp :tag "Match") (sexp :tag "Type")))
 This is used for guessing the type of variables not declared with
 customize."
   :type '(repeat (group (regexp :tag "Match") (sexp :tag "Type")))

-  :group 'customize)
+  :group 'custom-buffer)

 
 (defcustom custom-guess-doc-alist
   '(("\\`\\*?Non-nil " boolean))
 
 (defcustom custom-guess-doc-alist
   '(("\\`\\*?Non-nil " boolean))


@@ -625,7 +619,7 @@ matches the name of the symbol will be used.
 This is used for guessing the type of variables not declared with
 customize."
   :type '(repeat (group (regexp :tag "Match") (sexp :tag "Type")))
 This is used for guessing the type of variables not declared with
 customize."
   :type '(repeat (group (regexp :tag "Match") (sexp :tag "Type")))

-  :group 'customize)
+  :group 'custom-buffer)

 
 (defun custom-guess-type (symbol)
   "Guess a widget suitable for editing the value of SYMBOL.
 
 (defun custom-guess-type (symbol)
   "Guess a widget suitable for editing the value of SYMBOL.


@@ -736,29 +730,42 @@ groups after non-groups, if nil do not order groups at all."
   "Customization widgets in the current buffer.")
 
 (defun Custom-set ()
   "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)
   (let ((children custom-options))
   (interactive)
   (let ((children custom-options))

-    (mapc (lambda (child)
-           (when (eq (widget-get child :custom-state) 'modified)
-             (widget-apply child :custom-set)))
-           children)))
+    (if (or (and (= 1 (length children))
+                (memq (widget-type (car children))
+                      '(custom-variable custom-face)))
+           (y-or-n-p "Set all values according to this buffer? "))
+       (mapc (lambda (child)
+               (when (eq (widget-get child :custom-state) 'modified)
+                 (widget-apply child :custom-set)))
+             children)
+      (message "Aborted"))))

 
 (defun Custom-save ()
 
 (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)
   (let ((children custom-options))
   (interactive)
   (let ((children custom-options))

-    (mapc (lambda (child)
-           (when (memq (widget-get child :custom-state)
-                       '(modified set changed rogue))
-             (widget-apply child :custom-save)))
-           children))
-  (custom-save-all))
+    (if (or (and (= 1 (length children))
+                (memq (widget-type (car children))
+                      '(custom-variable custom-face)))
+           (yes-or-no-p "Save all settings in this buffer? "))
+       (progn
+         (mapc (lambda (child)
+                 (when (memq (widget-get child :custom-state)
+                             '(modified set changed rogue))
+                   (widget-apply child :custom-save)))
+               children)
+         (custom-save-all))
+      (message "Aborted"))))

 
 (defvar custom-reset-menu
 
 (defvar custom-reset-menu

-  '(("Current" . Custom-reset-current)
-    ("Saved" . Custom-reset-saved)
-    ("Erase Customization (use standard settings)" . Custom-reset-standard))
+  '(("Undo Edits" . Custom-reset-current)
+    ("Reset to Saved" . Custom-reset-saved)
+    ("Erase Customization (use standard values)" . Custom-reset-standard))

   "Alist of actions for the `Reset' button.
 The key is a string containing the name of the action, the value is a
 Lisp function taking the widget as an element which will be called
   "Alist of actions for the `Reset' button.
 The key is a string containing the name of the action, the value is a
 Lisp function taking the widget as an element which will be called


@@ -767,51 +774,63 @@ when the action is chosen.")
 (defun custom-reset (event)
   "Select item from reset menu."
   (let* ((completion-ignore-case t)
 (defun custom-reset (event)
   "Select item from reset menu."
   (let* ((completion-ignore-case t)

-        (answer (widget-choose "Reset to"
+        (answer (widget-choose "Reset settings"

                                custom-reset-menu
                                event)))
     (if answer
        (funcall answer))))
 
 (defun Custom-reset-current (&rest ignore)
                                custom-reset-menu
                                event)))
     (if answer
        (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)
   (let ((children custom-options))
   (interactive)
   (let ((children custom-options))

-    (mapc (lambda (widget)
-           (if (memq (widget-get widget :custom-state)
-                     '(modified changed))
-               (widget-apply widget :custom-reset-current)))
-         children)))
+    (if (or (and (= 1 (length children))
+                (memq (widget-type (car children))
+                      '(custom-variable custom-face)))
+           (y-or-n-p "Reset all settings' buffer text to show current values? "))
+       (mapc (lambda (widget)
+               (if (memq (widget-get widget :custom-state)
+                         '(modified changed))
+                   (widget-apply widget :custom-reset-current)))
+             children)
+      (message "Aborted"))))

 
 (defun Custom-reset-saved (&rest ignore)
 
 (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)
   (let ((children custom-options))
   (interactive)
   (let ((children custom-options))

-    (mapc (lambda (widget)
-           (if (memq (widget-get widget :custom-state)
-                     '(modified set changed rogue))
-               (widget-apply widget :custom-reset-saved)))
-         children)))
+    (if (or (and (= 1 (length children))
+                (memq (widget-type (car children))
+                      '(custom-variable custom-face)))
+           (y-or-n-p "Reset all settings (current values and buffer text) to saved values? "))
+       (mapc (lambda (widget)
+               (if (memq (widget-get widget :custom-state)
+                         '(modified set changed rogue))
+                   (widget-apply widget :custom-reset-saved)))
+             children)
+      (message "Aborted"))))

 
 (defun Custom-reset-standard (&rest ignore)
   "Erase all customization (either current or saved) for the group members.
 
 (defun Custom-reset-standard (&rest ignore)
   "Erase all customization (either current or saved) for the group members.

-The immediate result is to restore them to their standard settings.
-This operation eliminates any saved settings for the group members,
+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)
   (let ((children custom-options))
 making them as if they had never been customized at all."
   (interactive)
   (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))))
+    (if (or (and (= 1 (length children))
+                (memq (widget-type (car children))
+                      '(custom-variable custom-face)))
+           (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)
+                      t)
+                    (memq (widget-get widget :custom-state)
+                          '(modified set changed saved rogue))
+                    (widget-apply widget :custom-reset-standard)))
+             children)
+      (message "Aborted"))))

 
 ;;; The Customize Commands
 
 
 ;;; The Customize Commands
 


@@ -899,6 +918,7 @@ If given a prefix (or a COMMENT argument), also prompt for a comment."
                                       "Set customized value for %s to: "
                                       current-prefix-arg))
   (custom-load-symbol variable)
                                       "Set customized value for %s to: "
                                       current-prefix-arg))
   (custom-load-symbol variable)

+  (custom-push-theme 'theme-value variable 'user 'set (custom-quote value))

   (funcall (or (get variable 'custom-set) 'set-default) variable value)
   (put variable 'customized-value (list (custom-quote value)))
   (cond ((string= comment "")
   (funcall (or (get variable 'custom-set) 'set-default) variable value)
   (put variable 'customized-value (list (custom-quote value)))
   (cond ((string= comment "")


@@ -932,7 +952,7 @@ If given a prefix (or a COMMENT argument), also prompt for a comment."
                                       current-prefix-arg))
   (funcall (or (get variable 'custom-set) 'set-default) variable value)
   (put variable 'saved-value (list (custom-quote value)))
                                       current-prefix-arg))
   (funcall (or (get variable 'custom-set) 'set-default) variable value)
   (put variable 'saved-value (list (custom-quote value)))

-  (custom-push-theme 'theme-value variable 'user 'set (list (custom-quote value)))
+  (custom-push-theme 'theme-value variable 'user 'set (custom-quote value))

   (cond ((string= comment "")
         (put variable 'variable-comment nil)
         (put variable 'saved-variable-comment nil))
   (cond ((string= comment "")
         (put variable 'variable-comment nil)
         (put variable 'saved-variable-comment nil))


@@ -1057,21 +1077,54 @@ Show the buffer in another window, but don't select it."
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 

-(defvar customize-changed-options-previous-release "20.2"
+(defvar customize-changed-options-previous-release "21.1"

   "Version for `customize-changed-options' to refer back to by default.")
 
   "Version for `customize-changed-options' to refer back to by default.")
 

+;; Packages will update this variable, so make it available.
+;;;###autoload
+(defvar customize-package-emacs-version-alist nil
+  "Alist mapping versions of Emacs to versions of a package.
+These package versions are listed in the :package-version
+keyword used in `defcustom', `defgroup', and `defface'. Its
+elements look like this:
+
+     (PACKAGE (PVERSION . EVERSION)...)
+
+For each PACKAGE, which is a symbol, there are one or more
+elements that contain a package version PVERSION with an
+associated Emacs version EVERSION.  These versions are strings.
+For example, the MH-E package updates this alist with the
+following:
+
+     (add-to-list 'customize-package-emacs-version-alist
+                  '(MH-E (\"6.0\" . \"22.1\") (\"6.1\" . \"22.1\")
+                         (\"7.0\" . \"22.1\") (\"7.1\" . \"22.1\")
+                         (\"7.2\" . \"22.1\") (\"7.3\" . \"22.1\")
+                         (\"7.4\" . \"22.1\") (\"8.0\" . \"22.1\")))
+
+The value of PACKAGE needs to be unique and it needs to match the
+PACKAGE value appearing in the :package-version keyword.  Since
+the user might see the value in a error message, a good choice is
+the official name of the package, such as MH-E or Gnus.")
+
+;;;###autoload
+(defalias 'customize-changed 'customize-changed-options)
+

 ;;;###autoload
 (defun customize-changed-options (since-version)
 ;;;###autoload
 (defun customize-changed-options (since-version)

-  "Customize all user option variables changed in Emacs itself.
+  "Customize all settings whose meanings have changed in Emacs itself.

 This includes new user option variables and faces, and new
 This includes new user option variables and faces, and new

-customization groups, as well as older options and faces whose default
-values have changed since the previous major Emacs release.
+customization groups, as well as older options and faces whose meanings
+or default values have changed since the previous major Emacs release.

 
 

-With argument SINCE-VERSION (a string), customize all user option
-variables that were added (or their meanings were changed) since that
-version."
+With argument SINCE-VERSION (a string), customize all settings
+that were added or redefined since that version."

 
 

-  (interactive "sCustomize options changed, since version (default all versions): ")
+  (interactive
+   (list
+    (read-from-minibuffer
+     (format "Customize options changed, since version (default %s): "
+            customize-changed-options-previous-release))))

   (if (equal since-version "")
       (setq since-version nil)
     (unless (condition-case nil
   (if (equal since-version "")
       (setq since-version nil)
     (unless (condition-case nil


@@ -1094,7 +1147,12 @@ version."
   (let (found)
     (mapatoms
      (lambda (symbol)
   (let (found)
     (mapatoms
      (lambda (symbol)

-       (let ((version (get symbol 'custom-version)))
+        (let* ((package-version (get symbol 'custom-package-version))
+               (version
+                (or (and package-version
+                         (customize-package-emacs-version symbol
+                                                          package-version))
+                    (get symbol 'custom-version))))

         (if version
             (when (customize-version-lessp since-version version)
               (if (or (get symbol 'custom-group)
         (if version
             (when (customize-version-lessp since-version version)
               (if (or (get symbol 'custom-group)


@@ -1110,6 +1168,32 @@ version."
       (error "No user option defaults have been changed since Emacs %s"
             since-version))))
 
       (error "No user option defaults have been changed since Emacs %s"
             since-version))))
 

+(defun customize-package-emacs-version (symbol package-version)
+  "Return Emacs version of SYMBOL.
+PACKAGE-VERSION has the form (PACKAGE . VERSION).  The VERSION of
+PACKAGE is looked up in the associated list
+`customize-package-emacs-version-alist' to find the version of
+Emacs that is associated with it."
+  (let (package-versions emacs-version)
+    ;; Use message instead of error since we want user to be able to
+    ;; see the rest of the symbols even if a package author has
+    ;; botched things up.
+    (cond ((not (listp package-version))
+           (message "Invalid package-version value for %s" symbol))
+          ((setq package-versions (assq (car package-version)
+                                        customize-package-emacs-version-alist))
+           (setq emacs-version
+                 (cdr (assoc (cdr package-version) package-versions)))
+           (unless emacs-version
+             (message "%s version %s not found in %s" symbol
+                      (cdr package-version)
+                      "customize-package-emacs-version-alist")))
+          (t
+           (message "Package %s neglected to update %s"
+                    (car package-version)
+                    "customize-package-emacs-version-alist")))
+    emacs-version))
+

 (defun customize-version-lessp (version1 version2)
   ;; Why are the versions strings, and given that they are, why aren't
   ;; they converted to numbers and compared as such here?  -- fx
 (defun customize-version-lessp (version1 version2)
   ;; Why are the versions strings, and given that they are, why aren't
   ;; they converted to numbers and compared as such here?  -- fx


@@ -1214,7 +1298,7 @@ suggest to customize that face, if it's customizable."
 
 ;;;###autoload
 (defun customize-rogue ()
 
 ;;;###autoload
 (defun customize-rogue ()

-  "Customize all user variable modified outside customize."
+  "Customize all user variables modified outside customize."

   (interactive)
   (let ((found nil))
     (mapatoms (lambda (symbol)
   (interactive)
   (let ((found nil))
     (mapatoms (lambda (symbol)


@@ -1252,12 +1336,13 @@ suggest to customize that face, if it's customizable."
 
 ;;;###autoload
 (defun customize-apropos (regexp &optional all)
 
 ;;;###autoload
 (defun customize-apropos (regexp &optional all)

-  "Customize all user options matching REGEXP.
+  "Customize all loaded options, faces and groups matching REGEXP.

 If ALL is `options', include only options.
 If ALL is `faces', include only faces.
 If ALL is `groups', include only groups.
 If ALL is `options', include only options.
 If ALL is `faces', include only faces.
 If ALL is `groups', include only groups.

-If ALL is t (interactively, with prefix arg), include options which are not
-user-settable, as well as faces and groups."
+If ALL is t (interactively, with prefix arg), include variables
+that are not customizable options, as well as faces and groups
+\(but we recommend using `apropos-variable' instead)."

   (interactive "sCustomize regexp: \nP")
   (let ((found nil))
     (mapatoms (lambda (symbol)
   (interactive "sCustomize regexp: \nP")
   (let ((found nil))
     (mapatoms (lambda (symbol)


@@ -1270,11 +1355,11 @@ user-settable, as well as faces and groups."
                    (push (list symbol 'custom-face) found))
                  (when (and (not (memq all '(groups faces)))
                             (boundp symbol)
                    (push (list symbol 'custom-face) found))
                  (when (and (not (memq all '(groups faces)))
                             (boundp symbol)

+                            (eq (indirect-variable symbol) symbol)

                             (or (get symbol 'saved-value)
                                 (custom-variable-p symbol)
                             (or (get symbol 'saved-value)
                                 (custom-variable-p symbol)

-                                (if (memq all '(nil options))
-                                    (user-variable-p symbol)
-                                  (get symbol 'variable-documentation))))
+                                (and (not (memq all '(nil options)))
+                                     (get symbol 'variable-documentation))))

                    (push (list symbol 'custom-variable) found)))))
     (if (not found)
        (error "No matches")
                    (push (list symbol 'custom-variable) found)))))
     (if (not found)
        (error "No matches")


@@ -1284,20 +1369,21 @@ user-settable, as well as faces and groups."
 
 ;;;###autoload
 (defun customize-apropos-options (regexp &optional arg)
 
 ;;;###autoload
 (defun customize-apropos-options (regexp &optional arg)

-  "Customize all user options matching REGEXP.
-With prefix arg, include options which are not user-settable."
+  "Customize all loaded customizable options matching REGEXP.
+With prefix arg, include variables that are not customizable options
+\(but we recommend using `apropos-variable' instead)."

   (interactive "sCustomize regexp: \nP")
   (customize-apropos regexp (or arg 'options)))
 
 ;;;###autoload
 (defun customize-apropos-faces (regexp)
   (interactive "sCustomize regexp: \nP")
   (customize-apropos regexp (or arg 'options)))
 
 ;;;###autoload
 (defun customize-apropos-faces (regexp)

-  "Customize all user faces matching REGEXP."
+  "Customize all loaded faces matching REGEXP."

   (interactive "sCustomize regexp: \n")
   (customize-apropos regexp 'faces))
 
 ;;;###autoload
 (defun customize-apropos-groups (regexp)
   (interactive "sCustomize regexp: \n")
   (customize-apropos regexp 'faces))
 
 ;;;###autoload
 (defun customize-apropos-groups (regexp)

-  "Customize all user groups matching REGEXP."
+  "Customize all loaded groups matching REGEXP."

   (interactive "sCustomize regexp: \n")
   (customize-apropos regexp 'groups))
 
   (interactive "sCustomize regexp: \n")
   (customize-apropos regexp 'groups))
 


@@ -1393,6 +1479,9 @@ This button will have a menu with all three reset operations."
 (defvar custom-button nil
   "Face used for buttons in customization buffers.")
 
 (defvar custom-button nil
   "Face used for buttons in customization buffers.")
 

+(defvar custom-button-mouse nil
+  "Mouse face used for buttons in customization buffers.")
+

 (defvar custom-button-pressed nil
   "Face used for pressed buttons in customization buffers.")
 
 (defvar custom-button-pressed nil
   "Face used for pressed buttons in customization buffers.")
 


@@ -1407,6 +1496,8 @@ Otherwise use brackets."
         (custom-set-default variable value)
         (setq custom-button
               (if value 'custom-button 'custom-button-unraised))
         (custom-set-default variable value)
         (setq custom-button
               (if value 'custom-button 'custom-button-unraised))

+        (setq custom-button-mouse
+              (if value 'custom-button-mouse 'highlight))

         (setq custom-button-pressed
               (if value
                   'custom-button-pressed
         (setq custom-button-pressed
               (if value
                   'custom-button-pressed


@@ -1420,26 +1511,27 @@ Otherwise use brackets."
        (if description
            (widget-insert description))
        (widget-insert (format ".
        (if description
            (widget-insert description))
        (widget-insert (format ".

-%s show active fields; type RET or click mouse-1
-on an active field to invoke its action.  Editing an option value
-changes only the text in the buffer.  Invoke the State button to set or
-save the option value.  Saving an option normally edits your init file.
-Invoke "
+%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
                               (if custom-raised-buttons

-                                  "`Raised' buttons"
-                                "Square brackets")))
-       (widget-create 'info-link
+                                  "`Raised' text indicates"
+                                "Square brackets indicate")))
+       (widget-create 'custom-manual

                       :tag "Custom file"
                       "(emacs)Saving Customizations")
        (widget-insert
                       :tag "Custom file"
                       "(emacs)Saving Customizations")
        (widget-insert

-        " for information on how to save in a different file.
-Invoke ")
-       (widget-create 'info-link
+        " for information on how to save in a different file.\n
+See ")
+       (widget-create 'custom-manual

                       :tag "Help"
                       :help-echo "Read the online help."
                       "(emacs)Easy Customization")
                       :tag "Help"
                       :help-echo "Read the online help."
                       "(emacs)Easy Customization")

-       (widget-insert " for general information.\n\n")
-       (widget-insert "Operate on everything in this buffer:\n "))
+       (widget-insert " for more information.\n\n")
+       (widget-insert "Operate on all settings in this buffer that \
+are not marked HIDDEN:\n "))

     (widget-insert " "))
   (widget-create 'push-button
                 :tag "Set for Current Session"
     (widget-insert " "))
   (widget-create 'push-button
                 :tag "Set for Current Session"


@@ -1447,26 +1539,34 @@ Invoke ")
 Make your editing in this buffer take effect for this session."
                 :action (lambda (widget &optional event)
                           (Custom-set)))
 Make your editing in this buffer take effect for this session."
                 :action (lambda (widget &optional event)
                           (Custom-set)))

-  (widget-insert " ")
-  (widget-create 'push-button
-                :tag "Save for Future Sessions"
-                :help-echo "\
+  (if (not custom-buffer-verbose-help)
+      (progn
+       (widget-insert " ")
+       (widget-create 'custom-manual
+                      :tag "Help"
+                      :help-echo "Read the online help."
+                      "(emacs)Easy Customization")))
+  (when (or custom-file user-init-file)
+    (widget-insert " ")
+    (widget-create 'push-button
+                  :tag "Save for Future Sessions"
+                  :help-echo "\

 Make your editing in this buffer take effect for future Emacs sessions.
 This updates your Emacs initialization file or creates a new one."
 Make your editing in this buffer take effect for future Emacs sessions.
 This updates your Emacs initialization file or creates a new one."

-                :action (lambda (widget &optional event)
-                          (Custom-save)))
+                  :action (lambda (widget &optional event)
+                            (Custom-save))))

   (if custom-reset-button-menu
       (progn
        (widget-insert " ")
        (widget-create 'push-button
   (if custom-reset-button-menu
       (progn
        (widget-insert " ")
        (widget-create 'push-button

-                      :tag "Reset"
+                      :tag "Reset buffer"

                       :help-echo "Show a menu with reset operations."
                       :mouse-down-action (lambda (&rest junk) t)
                       :action (lambda (widget &optional event)
                                 (custom-reset event))))
     (widget-insert "\n ")
     (widget-create 'push-button
                       :help-echo "Show a menu with reset operations."
                       :mouse-down-action (lambda (&rest junk) t)
                       :action (lambda (widget &optional event)
                                 (custom-reset event))))
     (widget-insert "\n ")
     (widget-create 'push-button

-                  :tag "Reset"
+                  :tag "Undo Edits"

                   :help-echo "\
 Reset all edited text in this buffer to reflect current values."
                   :action 'Custom-reset-current)
                   :help-echo "\
 Reset all edited text in this buffer to reflect current values."
                   :action 'Custom-reset-current)


@@ -1474,21 +1574,15 @@ Reset all edited text in this buffer to reflect current values."
     (widget-create 'push-button
                   :tag "Reset to Saved"
                   :help-echo "\
     (widget-create 'push-button
                   :tag "Reset to Saved"
                   :help-echo "\

-Reset all values in this buffer to their saved settings."
+Reset all settings in this buffer to their saved values."

                   :action 'Custom-reset-saved)
     (widget-insert " ")
                   :action 'Custom-reset-saved)
     (widget-insert " ")

-    (widget-create 'push-button
-                  :tag "Erase Customization"
-                  :help-echo "\
-Un-customize all values in this buffer.  They get their standard settings."
-                  :action 'Custom-reset-standard))
-  (if (not custom-buffer-verbose-help)
-      (progn
-       (widget-insert " ")
-       (widget-create 'info-link
-                      :tag "Help"
-                      :help-echo "Read the online help."
-                      "(emacs)Easy Customization")))
+    (when (or custom-file user-init-file)
+      (widget-create 'push-button
+                    :tag "Erase Customization"
+                    :help-echo "\
+Un-customize all settings in this buffer and save them with standard values."
+                    :action 'Custom-reset-standard)))

   (widget-insert "   ")
   (widget-create 'push-button
                 :tag "Finish"
   (widget-insert "   ")
   (widget-create 'push-button
                 :tag "Finish"


@@ -1550,10 +1644,15 @@ Un-customize all values in this buffer.  They get their standard settings."
   (let ((name "*Customize Browser*"))
     (pop-to-buffer (custom-get-fresh-buffer name)))
   (custom-mode)
   (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")
   (if custom-browse-only-groups
       (widget-insert "\
 Invoke the [Group] button below to edit that item in another window.\n\n")


@@ -1592,7 +1691,7 @@ item in another window.\n\n"))
   (let ((custom-buffer-style 'tree))
     (custom-toggle-parent widget)))
 
   (let ((custom-buffer-style 'tree))
     (custom-toggle-parent widget)))
 

-(define-widget 'custom-browse-group-tag 'push-button
+(define-widget 'custom-browse-group-tag 'custom-group-link

   "Show parent in other window when activated."
   :tag "Group"
   :tag-glyph "folder"
   "Show parent in other window when activated."
   :tag "Group"
   :tag-glyph "folder"


@@ -1602,7 +1701,7 @@ item in another window.\n\n"))
   (let ((parent (widget-get widget :parent)))
     (customize-group-other-window (widget-value parent))))
 
   (let ((parent (widget-get widget :parent)))
     (customize-group-other-window (widget-value parent))))
 

-(define-widget 'custom-browse-variable-tag 'push-button
+(define-widget 'custom-browse-variable-tag 'custom-group-link

   "Show parent in other window when activated."
   :tag "Option"
   :tag-glyph "option"
   "Show parent in other window when activated."
   :tag "Option"
   :tag-glyph "option"


@@ -1612,7 +1711,7 @@ item in another window.\n\n"))
   (let ((parent (widget-get widget :parent)))
     (customize-variable-other-window (widget-value parent))))
 
   (let ((parent (widget-get widget :parent)))
     (customize-variable-other-window (widget-value parent))))
 

-(define-widget 'custom-browse-face-tag 'push-button
+(define-widget 'custom-browse-face-tag 'custom-group-link

   "Show parent in other window when activated."
   :tag "Face"
   :tag-glyph "face"
   "Show parent in other window when activated."
   :tag "Face"
   :tag-glyph "face"


@@ -1668,6 +1767,9 @@ item in another window.\n\n"))
 (define-widget 'custom-manual 'info-link
   "Link to the manual entry for this customization option."
   :help-echo "Read the manual entry for this option."
 (define-widget 'custom-manual 'info-link
   "Link to the manual entry for this customization option."
   :help-echo "Read the manual entry for this option."

+  :button-face 'custom-link
+  :mouse-face 'highlight
+  :pressed-face 'highlight

   :tag "Manual")
 
 ;;; The `custom-magic' Widget.
   :tag "Manual")
 
 ;;; The `custom-magic' Widget.


@@ -1728,6 +1830,15 @@ item in another window.\n\n"))
 ;; backward-compatibility alias
 (put 'custom-changed-face 'face-alias 'custom-changed)
 
 ;; backward-compatibility alias
 (put 'custom-changed-face 'face-alias 'custom-changed)
 

+(defface custom-themed '((((min-colors 88) (class color))
+                          (:foreground "white" :background "blue1"))
+                         (((class color))
+                          (:foreground "white" :background "blue"))
+                         (t
+                          (:slant italic)))
+  "Face used when the customize item has been set by a theme."
+  :group 'custom-magic-faces)
+

 (defface custom-saved '((t (:underline t)))
   "Face used when the customize item has been saved."
   :group 'custom-magic-faces)
 (defface custom-saved '((t (:underline t)))
   "Face used when the customize item has been saved."
   :group 'custom-magic-faces)


@@ -1756,12 +1867,15 @@ something in this group has been changed outside customize.")
     (saved "!" custom-saved "\
 SAVED and set." "\
 something in this group has been set and saved.")
     (saved "!" custom-saved "\
 SAVED and set." "\
 something in this group has been set and saved.")

+    (themed "o" custom-themed "\
+THEMED." "\
+visible group members are all at standard values.")

     (rogue "@" custom-rogue "\
     (rogue "@" custom-rogue "\

-NO CUSTOMIZATION DATA; you should not see this." "\
+NO CUSTOMIZATION DATA; not intended to be customized." "\

 something in this group is not prepared for customization.")
     (standard " " nil "\
 STANDARD." "\
 something in this group is not prepared for customization.")
     (standard " " nil "\
 STANDARD." "\

-visible group members are all at standard settings."))
+visible group members are all at standard values."))

   "Alist of customize option states.
 Each entry is of the form (STATE MAGIC FACE ITEM-DESC [ GROUP-DESC ]), where
 
   "Alist of customize option states.
 Each entry is of the form (STATE MAGIC FACE ITEM-DESC [ GROUP-DESC ]), where
 


@@ -1929,14 +2043,18 @@ and `face'."
 ;; backward-compatibility alias
 (put 'custom-button-face 'face-alias 'custom-button)
 
 ;; backward-compatibility alias
 (put 'custom-button-face 'face-alias 'custom-button)
 

+(defface custom-button-mouse
+  '((((type x w32 mac) (class color))
+     (:box (:line-width 2 :style released-button)
+          :background "grey90" :foreground "black"))
+    (t
+     nil))
+  "Mouse face for custom buffer buttons if `custom-raised-buttons' is non-nil."
+  :version "22.1"
+  :group 'custom-faces)
+

 (defface custom-button-unraised
 (defface custom-button-unraised

-  '((((min-colors 88)
-      (class color) (background light)) :foreground "blue1" :underline t)
-    (((class color) (background light)) :foreground "blue" :underline t)
-    (((min-colors 88)
-      (class color) (background dark)) :foreground "cyan1" :underline t)
-    (((class color) (background dark)) :foreground "cyan" :underline t)
-    (t :underline t))
+  '((t :inherit underline))

   "Face for custom buffer buttons if `custom-raised-buttons' is nil."
   :version "22.1"
   :group 'custom-faces)
   "Face for custom buffer buttons if `custom-raised-buttons' is nil."
   :version "22.1"
   :group 'custom-faces)


@@ -1944,6 +2062,9 @@ and `face'."
 (setq custom-button
       (if custom-raised-buttons 'custom-button 'custom-button-unraised))
 
 (setq custom-button
       (if custom-raised-buttons 'custom-button 'custom-button-unraised))
 

+(setq custom-button-mouse
+      (if custom-raised-buttons 'custom-button-mouse 'highlight))
+

 (defface custom-button-pressed
   '((((type x w32 mac) (class color))
      (:box (:line-width 2 :style pressed-button)
 (defface custom-button-pressed
   '((((type x w32 mac) (class color))
      (:box (:line-width 2 :style pressed-button)


@@ -1969,7 +2090,7 @@ and `face'."
       'custom-button-pressed
     'custom-button-pressed-unraised))
 
       'custom-button-pressed
     'custom-button-pressed-unraised))
 

-(defface custom-documentation nil
+(defface custom-documentation '((t nil))

   "Face used for documentation strings in customization buffers."
   :group 'custom-faces)
 ;; backward-compatibility alias
   "Face used for documentation strings in customization buffers."
   :group 'custom-faces)
 ;; backward-compatibility alias


@@ -1987,6 +2108,12 @@ and `face'."
 ;; backward-compatibility alias
 (put 'custom-state-face 'face-alias 'custom-state)
 
 ;; backward-compatibility alias
 (put 'custom-state-face 'face-alias 'custom-state)
 

+(defface custom-link
+  '((t :inherit link))
+  "Face for links in customization buffers."
+  :version "22.1"
+  :group 'custom-faces)
+

 (define-widget 'custom 'default
   "Customize a user option."
   :format "%v"
 (define-widget 'custom 'default
   "Customize a user option."
   :format "%v"


@@ -2121,7 +2248,11 @@ Insert PREFIX first if non-nil."
        (insert prefix))
       (insert "See also ")
       (while links
        (insert prefix))
       (insert "See also ")
       (while links

-       (push (widget-create-child-and-convert widget (car links))
+       (push (widget-create-child-and-convert
+              widget (car links)
+              :button-face 'custom-link
+              :mouse-face 'highlight
+              :pressed-face 'highlight)

              buttons)
        (setq links (cdr links))
        (cond ((null links)
              buttons)
        (setq links (cdr links))
        (cond ((null links)


@@ -2155,12 +2286,20 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
                  (setq parents (cons symbol parents)))))
     (and (null (get name 'custom-links)) ;No links of its own.
          (= (length parents) 1)         ;A single parent.
                  (setq parents (cons symbol parents)))))
     (and (null (get name 'custom-links)) ;No links of its own.
          (= (length parents) 1)         ;A single parent.

-         (let* ((links (get (car parents) 'custom-links))
+         (let* ((links (delq nil (mapcar (lambda (w)
+                                          (unless (eq (widget-type w)
+                                                      'custom-group-link)
+                                            w))
+                                        (get (car parents) 'custom-links))))

                 (many (> (length links) 2)))
            (when links
              (insert "\nParent documentation: ")
              (while links
                 (many (> (length links) 2)))
            (when links
              (insert "\nParent documentation: ")
              (while links

-               (push (widget-create-child-and-convert widget (car links))
+               (push (widget-create-child-and-convert
+                     widget (car links)
+                     :button-face 'custom-link
+                     :mouse-face 'highlight
+                     :pressed-face 'highlight)

                      buttons)
                (setq links (cdr links))
                (cond ((null links)
                      buttons)
                (setq links (cdr links))
                (cond ((null links)


@@ -2180,14 +2319,17 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
 ;;; The `custom-comment' Widget.
 
 ;; like the editable field
 ;;; The `custom-comment' Widget.
 
 ;; like the editable field

-(defface custom-comment '((((class grayscale color)
+(defface custom-comment '((((type tty))
+                          :background "yellow3"
+                          :foreground "black")
+                         (((class grayscale color)

                            (background light))
                            (background light))

-                          (:background "gray85"))
+                          :background "gray85")

                          (((class grayscale color)
                            (background dark))
                          (((class grayscale color)
                            (background dark))

-                          (:background "dim gray"))
+                          :background "dim gray")

                          (t
                          (t

-                          (:slant italic)))
+                          :slant italic))

   "Face used for comments on variables or faces"
   :version "21.1"
   :group 'custom-faces)
   "Face used for comments on variables or faces"
   :version "21.1"
   :group 'custom-faces)


@@ -2510,14 +2652,20 @@ Otherwise, look up symbol in `custom-guess-type-alist'."
                             (error nil))
                           'set
                         'changed))
                             (error nil))
                           'set
                         'changed))

-                     ((progn (setq tmp (get symbol 'saved-value))
+                     ((progn (setq tmp (get symbol 'theme-value))

                              (setq temp (get symbol 'saved-variable-comment))
                              (or tmp temp))
                       (if (condition-case nil
                              (setq temp (get symbol 'saved-variable-comment))
                              (or tmp temp))
                       (if (condition-case nil

-                              (and (equal value (eval (car tmp)))
-                                   (equal comment temp))
+                              (and (equal comment temp)
+                                   (equal value
+                                          (eval
+                                           (car (custom-variable-theme-value
+                                                 symbol)))))

                             (error nil))
                             (error nil))

-                          'saved
+                          (cond
+                           ((eq (caar tmp) 'user) 'saved)
+                           ((eq (caar tmp) 'changed) 'changed)
+                           (t 'themed))

                         'changed))
                      ((setq tmp (get symbol 'standard-value))
                       (if (condition-case nil
                         'changed))
                      ((setq tmp (get symbol 'standard-value))
                       (if (condition-case nil


@@ -2533,13 +2681,15 @@ Otherwise, look up symbol in `custom-guess-type-alist'."
   (get (widget-value widget) 'standard-value))
 
 (defvar custom-variable-menu
   (get (widget-value widget) 'standard-value))
 
 (defvar custom-variable-menu

-  '(("Set for Current Session" custom-variable-set
+  `(("Set for Current Session" custom-variable-set

      (lambda (widget)
        (eq (widget-get widget :custom-state) 'modified)))
      (lambda (widget)
        (eq (widget-get widget :custom-state) 'modified)))

-    ("Save for Future Sessions" custom-variable-save
-     (lambda (widget)
-       (memq (widget-get widget :custom-state) '(modified set changed rogue))))
-    ("Reset to Current" custom-redraw
+    ,@(when (or custom-file user-init-file)
+       '(("Save for Future Sessions" custom-variable-save
+          (lambda (widget)
+            (memq (widget-get widget :custom-state)
+                  '(modified set changed rogue))))))
+    ("Undo Edits" custom-redraw

      (lambda (widget)
        (and (default-boundp (widget-value widget))
            (memq (widget-get widget :custom-state) '(modified changed)))))
      (lambda (widget)
        (and (default-boundp (widget-value widget))
            (memq (widget-get widget :custom-state) '(modified changed)))))


@@ -2549,21 +2699,22 @@ Otherwise, look up symbol in `custom-guess-type-alist'."
                (get (widget-value widget) 'saved-variable-comment))
            (memq (widget-get widget :custom-state)
                  '(modified set changed rogue)))))
                (get (widget-value widget) 'saved-variable-comment))
            (memq (widget-get widget :custom-state)
                  '(modified set changed rogue)))))

-    ("Erase Customization" custom-variable-reset-standard
-     (lambda (widget)
-       (and (get (widget-value widget) 'standard-value)
-           (memq (widget-get widget :custom-state)
-                 '(modified set changed saved rogue)))))
-    ("Use Backup Value" custom-variable-reset-backup
+    ,@(when (or custom-file user-init-file)
+       '(("Erase Customization" custom-variable-reset-standard
+          (lambda (widget)
+            (and (get (widget-value widget) 'standard-value)
+                 (memq (widget-get widget :custom-state)
+                       '(modified set changed saved rogue)))))))
+    ("Set to Backup Value" custom-variable-reset-backup

      (lambda (widget)
        (get (widget-value widget) 'backup-value)))
     ("---" ignore ignore)
     ("Add Comment" custom-comment-show custom-comment-invisible-p)
     ("---" ignore ignore)
      (lambda (widget)
        (get (widget-value widget) 'backup-value)))
     ("---" ignore ignore)
     ("Add Comment" custom-comment-show custom-comment-invisible-p)
     ("---" ignore ignore)

-    ("Don't show as Lisp expression" custom-variable-edit
+    ("Show Current Value" custom-variable-edit

      (lambda (widget)
        (eq (widget-get widget :custom-form) 'lisp)))
      (lambda (widget)
        (eq (widget-get widget :custom-form) 'lisp)))

-    ("Show initial Lisp expression" custom-variable-edit-lisp
+    ("Show Saved Lisp Expression" custom-variable-edit-lisp

      (lambda (widget)
        (eq (widget-get widget :custom-form) 'edit))))
   "Alist of actions for the `custom-variable' widget.
      (lambda (widget)
        (eq (widget-get widget :custom-form) 'edit))))
   "Alist of actions for the `custom-variable' widget.


@@ -2624,6 +2775,8 @@ Optional EVENT is the location for the menu."
             ;; Make the comment invisible by hand if it's empty
             (custom-comment-hide comment-widget))
           (custom-variable-backup-value widget)
             ;; Make the comment invisible by hand if it's empty
             (custom-comment-hide comment-widget))
           (custom-variable-backup-value widget)

+          (custom-push-theme 'theme-value symbol 'user
+                             'set (custom-quote (widget-value child)))

           (funcall set symbol (eval (setq val (widget-value child))))
           (put symbol 'customized-value (list val))
           (put symbol 'variable-comment comment)
           (funcall set symbol (eval (setq val (widget-value child))))
           (put symbol 'customized-value (list val))
           (put symbol 'variable-comment comment)


@@ -2634,6 +2787,8 @@ Optional EVENT is the location for the menu."
             ;; Make the comment invisible by hand if it's empty
             (custom-comment-hide comment-widget))
           (custom-variable-backup-value widget)
             ;; Make the comment invisible by hand if it's empty
             (custom-comment-hide comment-widget))
           (custom-variable-backup-value widget)

+          (custom-push-theme 'theme-value symbol 'user
+                             'set (custom-quote (widget-value child)))

           (funcall set symbol (setq val (widget-value child)))
           (put symbol 'customized-value (list (custom-quote val)))
           (put symbol 'variable-comment comment)
           (funcall set symbol (setq val (widget-value child)))
           (put symbol 'customized-value (list (custom-quote val)))
           (put symbol 'variable-comment comment)


@@ -2663,7 +2818,7 @@ Optional EVENT is the location for the menu."
             (custom-comment-hide comment-widget))
           (put symbol 'saved-value (list (widget-value child)))
           (custom-push-theme 'theme-value symbol 'user
             (custom-comment-hide comment-widget))
           (put symbol 'saved-value (list (widget-value child)))
           (custom-push-theme 'theme-value symbol 'user

-                             'set (list (widget-value child)))
+                             'set (custom-quote (widget-value child)))

           (funcall set symbol (eval (widget-value child)))
           (put symbol 'variable-comment comment)
           (put symbol 'saved-variable-comment comment))
           (funcall set symbol (eval (widget-value child)))
           (put symbol 'variable-comment comment)
           (put symbol 'saved-variable-comment comment))


@@ -2675,8 +2830,7 @@ Optional EVENT is the location for the menu."
           (put symbol 'saved-value
                (list (custom-quote (widget-value child))))
           (custom-push-theme 'theme-value symbol 'user
           (put symbol 'saved-value
                (list (custom-quote (widget-value child))))
           (custom-push-theme 'theme-value symbol 'user

-                             'set (list (custom-quote (widget-value
-                                                 child))))
+                             'set (custom-quote (widget-value child)))

           (funcall set symbol (widget-value child))
           (put symbol 'variable-comment comment)
           (put symbol 'saved-variable-comment comment)))
           (funcall set symbol (widget-value child))
           (put symbol 'variable-comment comment)
           (put symbol 'saved-variable-comment comment)))


@@ -2688,6 +2842,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.
 
 (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))
 The value that was current before this operation
 becomes the backup value, so you can get it again."
   (let* ((symbol (widget-value widget))


@@ -2697,6 +2852,7 @@ becomes the backup value, so you can get it again."
     (cond ((or value comment)
           (put symbol 'variable-comment comment)
           (custom-variable-backup-value widget)
     (cond ((or value comment)
           (put symbol 'variable-comment comment)
           (custom-variable-backup-value widget)

+          (custom-push-theme 'theme-value symbol 'user 'set (car-safe value))

           (condition-case nil
               (funcall set symbol (eval (car value)))
             (error nil)))
           (condition-case nil
               (funcall set symbol (eval (car value)))
             (error nil)))


@@ -2714,23 +2870,17 @@ This operation eliminates any saved setting for the variable,
 restoring it to the state of a variable that has never been customized.
 The value that was current before this operation
 becomes the backup value, so you can get it again."
 restoring it to the state of a variable that has never been customized.
 The value that was current before this operation
 becomes the backup value, so you can get it again."

-  (let* ((symbol (widget-value widget))
-        (set (or (get symbol 'custom-set) 'set-default)))
+  (let* ((symbol (widget-value widget)))

     (if (get symbol 'standard-value)
     (if (get symbol 'standard-value)

-       (progn
-         (custom-variable-backup-value widget)
-         (funcall set symbol (eval (car (get symbol 'standard-value)))))
+       (custom-variable-backup-value widget)

       (error "No standard setting known for %S" symbol))
     (put symbol 'variable-comment nil)
     (put symbol 'customized-value nil)
     (put symbol 'customized-variable-comment nil)
       (error "No standard setting known for %S" symbol))
     (put symbol 'variable-comment nil)
     (put symbol 'customized-value nil)
     (put symbol 'customized-variable-comment nil)

+    (custom-push-theme 'theme-value symbol 'user 'reset)
+    (custom-theme-recalc-variable symbol)

     (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment))
       (put symbol 'saved-value nil)
     (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment))
       (put symbol 'saved-value nil)

-      (custom-push-theme 'theme-value symbol 'user 'reset 'standard)
-      ;; As a special optimizations we do not (explictly)
-      ;; save resets to standard when no theme set the value.
-      (if (null (cdr (get symbol 'theme-value)))
-         (put symbol 'theme-value nil))

       (put symbol 'saved-variable-comment nil)
       (custom-save-all))
     (widget-put widget :custom-state 'unknown)
       (put symbol 'saved-variable-comment nil)
       (custom-save-all))
     (widget-put widget :custom-state 'unknown)


@@ -2762,6 +2912,7 @@ to switch between two values."
     (if value
        (progn
          (custom-variable-backup-value widget)
     (if value
        (progn
          (custom-variable-backup-value widget)

+         (custom-push-theme 'theme-value symbol 'user 'set value)

          (condition-case nil
              (funcall set symbol (car value))
             (error nil)))
          (condition-case nil
              (funcall set symbol (car value))
             (error nil)))


@@ -3204,25 +3355,30 @@ SPEC must be a full face spec."
             (message "Creating face editor...done"))))))
 
 (defvar custom-face-menu
             (message "Creating face editor...done"))))))
 
 (defvar custom-face-menu

-  '(("Set for Current Session" custom-face-set)
-    ("Save for Future Sessions" custom-face-save-command)
+  `(("Set for Current Session" custom-face-set)
+    ,@(when (or custom-file user-init-file)
+       '(("Save for Future Sessions" custom-face-save)))
+    ("Undo Edits" custom-redraw
+     (lambda (widget)
+       (memq (widget-get widget :custom-state) '(modified changed))))

     ("Reset to Saved" custom-face-reset-saved
      (lambda (widget)
        (or (get (widget-value widget) 'saved-face)
           (get (widget-value widget) 'saved-face-comment))))
     ("Reset to Saved" custom-face-reset-saved
      (lambda (widget)
        (or (get (widget-value widget) 'saved-face)
           (get (widget-value widget) 'saved-face-comment))))

-    ("Erase Customization" custom-face-reset-standard
-     (lambda (widget)
-       (get (widget-value widget) 'face-defface-spec)))
+    ,@(when (or custom-file user-init-file)
+       '(("Erase Customization" custom-face-reset-standard
+          (lambda (widget)
+            (get (widget-value widget) 'face-defface-spec)))))

     ("---" ignore ignore)
     ("Add Comment" custom-comment-show custom-comment-invisible-p)
     ("---" ignore ignore)
     ("---" ignore ignore)
     ("Add Comment" custom-comment-show custom-comment-invisible-p)
     ("---" ignore ignore)

-    ("Show all display specs" custom-face-edit-all
-     (lambda (widget)
-       (not (eq (widget-get widget :custom-form) 'all))))
-    ("Just current attributes" custom-face-edit-selected
+    ("For Current Display" custom-face-edit-selected

      (lambda (widget)
        (not (eq (widget-get widget :custom-form) 'selected))))
      (lambda (widget)
        (not (eq (widget-get widget :custom-form) 'selected))))

-    ("Show as Lisp expression" custom-face-edit-lisp
+    ("For All Kinds of Displays" custom-face-edit-all
+     (lambda (widget)
+       (not (eq (widget-get widget :custom-form) 'all))))
+    ("Show Lisp Expression" custom-face-edit-lisp

      (lambda (widget)
        (not (eq (widget-get widget :custom-form) 'lisp)))))
   "Alist of actions for the `custom-face' widget.
      (lambda (widget)
        (not (eq (widget-get widget :custom-form) 'lisp)))))
   "Alist of actions for the `custom-face' widget.


@@ -3268,7 +3424,12 @@ widget.  If FILTER is nil, ACTION is always valid.")
                   (setq temp (get symbol 'saved-face-comment))
                   (or tmp temp))
                 (if (equal temp comment)
                   (setq temp (get symbol 'saved-face-comment))
                   (or tmp temp))
                 (if (equal temp comment)

-                    'saved
+                    (cond
+                     ((eq 'user (caar (get symbol 'theme-face)))
+                      'saved)
+                     ((eq 'changed (caar (get symbol 'theme-face)))
+                      'changed)
+                     (t 'themed))

                   'changed))
                ((get symbol 'face-defface-spec)
                 (if (equal comment nil)
                   'changed))
                ((get symbol 'face-defface-spec)
                 (if (equal comment nil)


@@ -3310,6 +3471,7 @@ Optional EVENT is the location for the menu."
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))
     (put symbol 'customized-face value)
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))
     (put symbol 'customized-face value)

+    (custom-push-theme 'theme-face symbol 'user 'set value)

     (if (face-spec-choose value)
        (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it
     (if (face-spec-choose value)
        (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it


@@ -3320,13 +3482,8 @@ Optional EVENT is the location for the menu."
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 

-(defun custom-face-save-command (widget)
-  "Save in `.emacs' the face attributes in WIDGET."
-  (custom-face-save widget)
-  (custom-save-all))
-

 (defun custom-face-save (widget)
 (defun custom-face-save (widget)

-  "Prepare for saving WIDGET's face attributes, but don't write `.emacs'."
+  "Save in `.emacs' the face attributes in WIDGET."

   (let* ((symbol (widget-value widget))
         (child (car (widget-get widget :children)))
         (value (custom-post-filter-face-spec (widget-value child)))
   (let* ((symbol (widget-value widget))
         (child (car (widget-get widget :children)))
         (value (custom-post-filter-face-spec (widget-value child)))


@@ -3336,6 +3493,7 @@ Optional EVENT is the location for the menu."
       (setq comment nil)
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))
       (setq comment nil)
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))

+    (custom-push-theme 'theme-face symbol 'user 'set value)

     (if (face-spec-choose value)
        (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it
     (if (face-spec-choose value)
        (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it


@@ -3343,7 +3501,6 @@ Optional EVENT is the location for the menu."
       (face-spec-set symbol '((t :foreground unspecified))))
     (unless (eq (widget-get widget :custom-state) 'standard)
       (put symbol 'saved-face value))
       (face-spec-set symbol '((t :foreground unspecified))))
     (unless (eq (widget-get widget :custom-state) 'standard)
       (put symbol 'saved-face value))

-    (custom-push-theme 'theme-face symbol 'user 'set value)

     (put symbol 'customized-face nil)
     (put symbol 'face-comment comment)
     (put symbol 'customized-face-comment nil)
     (put symbol 'customized-face nil)
     (put symbol 'face-comment comment)
     (put symbol 'customized-face-comment nil)


@@ -3352,6 +3509,10 @@ Optional EVENT is the location for the menu."
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 

+;; For backward compatibility.
+(define-obsolete-function-alias 'custom-face-save-command 'custom-face-save
+  "22.1")
+

 (defun custom-face-reset-saved (widget)
   "Restore WIDGET to the face's default attributes."
   (let* ((symbol (widget-value widget))
 (defun custom-face-reset-saved (widget)
   "Restore WIDGET to the face's default attributes."
   (let* ((symbol (widget-value widget))


@@ -3363,6 +3524,7 @@ Optional EVENT is the location for the menu."
       (error "No saved value for this face"))
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)
       (error "No saved value for this face"))
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)

+    (custom-push-theme 'theme-face symbol 'user 'set value)

     (face-spec-set symbol value)
     (put symbol 'face-comment comment)
     (widget-value-set child value)
     (face-spec-set symbol value)
     (put symbol 'face-comment comment)
     (widget-value-set child value)


@@ -3375,8 +3537,8 @@ Optional EVENT is the location for the menu."
   (get (widget-value widget) 'face-defface-spec))
 
 (defun custom-face-reset-standard (widget)
   (get (widget-value widget) 'face-defface-spec))
 
 (defun custom-face-reset-standard (widget)

-  "Restore WIDGET to the face's standard settings.
-This operation eliminates any saved setting for the face,
+  "Restore WIDGET to the face's standard attribute values.
+This operation eliminates any saved attributes for the face,

 restoring it to the state of a face that has never been customized."
   (let* ((symbol (widget-value widget))
         (child (car (widget-get widget :children)))
 restoring it to the state of a face that has never been customized."
   (let* ((symbol (widget-value widget))
         (child (car (widget-get widget :children)))


@@ -3386,17 +3548,18 @@ restoring it to the state of a face that has never been customized."
       (error "No standard setting for this face"))
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)
       (error "No standard setting for this face"))
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)

+    (custom-push-theme 'theme-face symbol 'user 'reset)
+    (face-spec-set symbol value)
+    (custom-theme-recalc-face symbol)

     (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
       (put symbol 'saved-face nil)
     (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
       (put symbol 'saved-face nil)

-      (custom-push-theme 'theme-face symbol 'user 'reset 'standard)
-      ;; Do not explictly save resets to standards without themes.
-      (if (null (cdr (get symbol 'theme-face)))
-         (put symbol  'theme-face nil))

       (put symbol 'saved-face-comment nil)
       (custom-save-all))
       (put symbol 'saved-face-comment nil)
       (custom-save-all))

-    (face-spec-set symbol value)

     (put symbol 'face-comment nil)
     (put symbol 'face-comment nil)

-    (widget-value-set child value)
+    (widget-value-set child
+                     (custom-pre-filter-face-spec
+                      (list (list t (custom-face-attributes-get
+                                     symbol nil)))))

     ;; This call manages the comment visibility
     (widget-value-set comment-widget "")
     (custom-face-state-set widget)
     ;; This call manages the comment visibility
     (widget-value-set comment-widget "")
     (custom-face-state-set widget)


@@ -3481,6 +3644,9 @@ restoring it to the state of a face that has never been customized."
 
 (define-widget 'custom-group-link 'link
   "Show parent in other window when activated."
 
 (define-widget 'custom-group-link 'link
   "Show parent in other window when activated."

+  :button-face 'custom-link
+  :mouse-face 'highlight
+  :pressed-face 'highlight

   :help-echo "Create customization buffer for this group."
   :action 'custom-group-link-action)
 
   :help-echo "Create customization buffer for this group."
   :action 'custom-group-link-action)
 


@@ -3794,21 +3960,23 @@ Creating group members... %2d%%"
           (insert "/\n")))))
 
 (defvar custom-group-menu
           (insert "/\n")))))
 
 (defvar custom-group-menu

-  '(("Set for Current Session" custom-group-set
+  `(("Set for Current Session" custom-group-set

      (lambda (widget)
        (eq (widget-get widget :custom-state) 'modified)))
      (lambda (widget)
        (eq (widget-get widget :custom-state) 'modified)))

-    ("Save for Future Sessions" custom-group-save
-     (lambda (widget)
-       (memq (widget-get widget :custom-state) '(modified set))))
-    ("Reset to Current" custom-group-reset-current
+    ,@(when (or custom-file user-init-file)
+       '(("Save for Future Sessions" custom-group-save
+          (lambda (widget)
+            (memq (widget-get widget :custom-state) '(modified set))))))
+    ("Undo Edits" custom-group-reset-current

      (lambda (widget)
        (memq (widget-get widget :custom-state) '(modified))))
     ("Reset to Saved" custom-group-reset-saved
      (lambda (widget)
        (memq (widget-get widget :custom-state) '(modified set))))
      (lambda (widget)
        (memq (widget-get widget :custom-state) '(modified))))
     ("Reset to Saved" custom-group-reset-saved
      (lambda (widget)
        (memq (widget-get widget :custom-state) '(modified set))))

-    ("Reset to standard setting" custom-group-reset-standard
-     (lambda (widget)
-       (memq (widget-get widget :custom-state) '(modified set saved)))))
+    ,@(when (or custom-file user-init-file)
+       '(("Erase Customization" custom-group-reset-standard
+          (lambda (widget)
+            (memq (widget-get widget :custom-state) '(modified set saved)))))))

   "Alist of actions for the `custom-group' widget.
 Each entry has the form (NAME ACTION FILTER) where NAME is the name of
 the menu entry, ACTION is the function to call on the widget when the
   "Alist of actions for the `custom-group' widget.
 Each entry has the form (NAME ACTION FILTER) where NAME is the name of
 the menu entry, ACTION is the function to call on the widget when the


@@ -3971,6 +4139,33 @@ if only the first line of the docstring is shown."))
        (save-buffer))
       (unless old-buffer
        (kill-buffer (current-buffer))))))
        (save-buffer))
       (unless old-buffer
        (kill-buffer (current-buffer))))))

+
+;;;###autoload
+(defun customize-save-customized ()
+  "Save all user options which have been set in this session."
+  (interactive)
+  (mapatoms (lambda (symbol)
+             (let ((face (get symbol 'customized-face))
+                   (value (get symbol 'customized-value))
+                   (face-comment (get symbol 'customized-face-comment))
+                   (variable-comment
+                    (get symbol 'customized-variable-comment)))
+               (when face
+                 (put symbol 'saved-face face)
+                 (custom-push-theme 'theme-face symbol 'user 'set value)
+                 (put symbol 'customized-face nil))
+               (when value
+                 (put symbol 'saved-value value)
+                 (custom-push-theme 'theme-value symbol 'user 'set value)
+                 (put symbol 'customized-value nil))
+               (when variable-comment
+                 (put symbol 'saved-variable-comment variable-comment)
+                 (put symbol 'customized-variable-comment nil))
+               (when face-comment
+                 (put symbol 'saved-face-comment face-comment)
+                 (put symbol 'customized-face-comment nil)))))
+  ;; We really should update all custom buffers here.
+  (custom-save-all))

 \f
 ;; Editing the custom file contents in a buffer.
 
 \f
 ;; Editing the custom file contents in a buffer.
 


@@ -4016,18 +4211,17 @@ This function does not save the buffer."
 (defun custom-save-variables ()
   "Save all customized variables in `custom-file'."
   (save-excursion
 (defun custom-save-variables ()
   "Save all customized variables in `custom-file'."
   (save-excursion

-    (custom-save-delete 'custom-load-themes)
-    (custom-save-delete 'custom-reset-variables)

     (custom-save-delete 'custom-set-variables)
     (custom-save-delete 'custom-set-variables)

-    (custom-save-loaded-themes)
-    (custom-save-resets 'theme-value 'custom-reset-variables nil)

     (let ((standard-output (current-buffer))
          (saved-list (make-list 1 0))
          sort-fold-case)
       ;; First create a sorted list of saved variables.
       (mapatoms
        (lambda (symbol)
     (let ((standard-output (current-buffer))
          (saved-list (make-list 1 0))
          sort-fold-case)
       ;; First create a sorted list of saved variables.
       (mapatoms
        (lambda (symbol)

-        (if (get symbol 'saved-value)
+        (if (and (get symbol 'saved-value)
+                 ;; ignore theme values
+                 (or (null (get symbol 'theme-value))
+                     (eq 'user (caar (get symbol 'theme-value)))))

             (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       (unless (bolp)
             (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       (unless (bolp)


@@ -4051,9 +4245,7 @@ This function does not save the buffer."
            (when (and (symbolp request) (not (featurep request)))
              (message "Unknown requested feature: %s" request)
              (setq requests (delq request requests))))
            (when (and (symbolp request) (not (featurep request)))
              (message "Unknown requested feature: %s" request)
              (setq requests (delq request requests))))

-         (when (or (and spec
-                        (eq (nth 0 spec) 'user)
-                        (eq (nth 1 spec) 'set))
+         (when (or (and spec (eq (car spec) 'user))

                    comment
                    (and (null spec) (get symbol 'saved-value)))
            (unless (bolp)
                    comment
                    (and (null spec) (get symbol 'saved-value)))
            (unless (bolp)


@@ -4083,14 +4275,14 @@ This function does not save the buffer."
   (save-excursion
     (custom-save-delete 'custom-reset-faces)
     (custom-save-delete 'custom-set-faces)
   (save-excursion
     (custom-save-delete 'custom-reset-faces)
     (custom-save-delete 'custom-set-faces)

-    (custom-save-resets 'theme-face 'custom-reset-faces '(default))

     (let ((standard-output (current-buffer))
          (saved-list (make-list 1 0))
          sort-fold-case)
       ;; First create a sorted list of saved faces.
       (mapatoms
        (lambda (symbol)
     (let ((standard-output (current-buffer))
          (saved-list (make-list 1 0))
          sort-fold-case)
       ;; First create a sorted list of saved faces.
       (mapatoms
        (lambda (symbol)

-        (if (get symbol 'saved-face)
+        (if (and (get symbol 'saved-face)
+                 (eq 'user (car (car-safe (get symbol 'theme-face)))))

             (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       ;; The default face must be first, since it affects the others.
             (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       ;; The default face must be first, since it affects the others.


@@ -4110,9 +4302,7 @@ This function does not save the buffer."
                            (and (not (custom-facep symbol))
                                 (not (get symbol 'force-face))))))
              (comment (get symbol 'saved-face-comment)))
                            (and (not (custom-facep symbol))
                                 (not (get symbol 'force-face))))))
              (comment (get symbol 'saved-face-comment)))

-         (when (or (and spec
-                        (eq (nth 0 spec) 'user)
-                        (eq (nth 1 spec) 'set))
+         (when (or (and spec (eq (nth 0 spec) 'user))

                    comment
                    (and (null spec) (get symbol 'saved-face)))
            ;; Don't print default face here.
                    comment
                    (and (null spec) (get symbol 'saved-face)))
            ;; Don't print default face here.


@@ -4134,71 +4324,6 @@ This function does not save the buffer."
       (princ ")")
       (unless (looking-at "\n")
        (princ "\n")))))
       (princ ")")
       (unless (looking-at "\n")
        (princ "\n")))))

-
-(defun custom-save-resets (property setter special)
-  (let (started-writing ignored-special)
-    ;; (custom-save-delete setter) Done by caller
-    (let ((standard-output (current-buffer))
-         (mapper `(lambda (object)
-                   (let ((spec (car-safe (get object (quote ,property)))))
-                     (when (and (not (memq object ignored-special))
-                                (eq (nth 0 spec) 'user)
-                                (eq (nth 1 spec) 'reset))
-                       ;; Do not write reset statements unless necessary.
-                       (unless started-writing
-                         (setq started-writing t)
-                         (unless (bolp)
-                           (princ "\n"))
-                       (princ "(")
-                       (princ (quote ,setter))
-                       (princ "\n '(")
-                       (prin1 object)
-                       (princ " ")
-                       (prin1 (nth 3 spec))
-                       (princ ")")))))))
-      (mapc mapper special)
-      (setq ignored-special special)
-      (mapatoms mapper)
-      (when started-writing
-       (princ ")\n")))))
-
-(defun custom-save-loaded-themes ()
-  (let ((themes (reverse (get 'user 'theme-loads-themes)))
-       (standard-output (current-buffer)))
-    (when themes
-      (unless (bolp) (princ "\n"))
-      (princ "(custom-load-themes")
-      (mapc (lambda (theme)
-             (princ "\n   '")
-             (prin1 theme)) themes)
-      (princ " )\n"))))
-
-;;;###autoload
-(defun customize-save-customized ()
-  "Save all user options which have been set in this session."
-  (interactive)
-  (mapatoms (lambda (symbol)
-             (let ((face (get symbol 'customized-face))
-                   (value (get symbol 'customized-value))
-                   (face-comment (get symbol 'customized-face-comment))
-                   (variable-comment
-                    (get symbol 'customized-variable-comment)))
-               (when face
-                 (put symbol 'saved-face face)
-                 (custom-push-theme 'theme-face symbol 'user 'set value)
-                 (put symbol 'customized-face nil))
-               (when value
-                 (put symbol 'saved-value value)
-                 (custom-push-theme 'theme-value symbol 'user 'set value)
-                 (put symbol 'customized-value nil))
-               (when variable-comment
-                 (put symbol 'saved-variable-comment variable-comment)
-                 (put symbol 'customized-variable-comment nil))
-               (when face-comment
-                 (put symbol 'saved-face-comment face-comment)
-                 (put symbol 'customized-face-comment nil)))))
-  ;; We really should update all custom buffers here.
-  (custom-save-all))

 \f
 ;;; The Customize Menu.
 
 \f
 ;;; The Customize Menu.
 


@@ -4299,7 +4424,6 @@ The format is suitable for use with `easy-menu-define'."
     (define-key map "u" 'Custom-goto-parent)
     (define-key map "n" 'widget-forward)
     (define-key map "p" 'widget-backward)
     (define-key map "u" 'Custom-goto-parent)
     (define-key map "n" 'widget-forward)
     (define-key map "p" 'widget-backward)

-    (define-key map [mouse-1] 'widget-move-and-invoke)

     map)
   "Keymap for `custom-mode'.")
 
     map)
   "Keymap for `custom-mode'.")
 


@@ -4310,11 +4434,20 @@ The format is suitable for use with `easy-menu-define'."
     ,(customize-menu-create 'customize)
     ["Set" Custom-set t]
     ["Save" Custom-save t]
     ,(customize-menu-create 'customize)
     ["Set" Custom-set t]
     ["Save" Custom-save t]

-    ["Reset to Current" Custom-reset-current t]
+    ["Undo Edits" Custom-reset-current t]

     ["Reset to Saved" Custom-reset-saved t]
     ["Reset to Saved" Custom-reset-saved t]

-    ["Reset to Standard Settings" Custom-reset-standard t]
+    ["Erase Customization" Custom-reset-standard t]

     ["Info" (info "(emacs)Easy Customization") t]))
 
     ["Info" (info "(emacs)Easy Customization") t]))
 

+(defvar custom-field-keymap
+  (let ((map (copy-keymap widget-field-keymap)))
+    (define-key map "\C-c\C-c" 'Custom-set)
+    (define-key map "\C-x\C-s" 'Custom-save)
+    map)
+  "Keymap used inside editable fields in customization buffers.")
+
+(widget-put (get 'editable-field 'widget-type) :keymap custom-field-keymap)
+

 (defun Custom-goto-parent ()
   "Go to the parent group listed at the top of this buffer.
 If several parents are listed, go to the first of them."
 (defun Custom-goto-parent ()
   "Go to the parent group listed at the top of this buffer.
 If several parents are listed, go to the first of them."


@@ -4340,18 +4473,20 @@ If several parents are listed, go to the first of them."
 
 The following commands are available:
 
 
 The following commands are available:
 

-Move to next button or editable field.     \\[widget-forward]
-Move to previous button or editable field. \\[widget-backward]
-\\<widget-field-keymap>\
+\\<widget-keymap>\
+Move to next button, link or editable field.     \\[widget-forward]
+Move to previous button, link or editable field. \\[advertised-widget-backward]
+\\<custom-field-keymap>\

 Complete content of editable text field.   \\[widget-complete]
 \\<custom-mode-map>\
 Complete content of editable text field.   \\[widget-complete]
 \\<custom-mode-map>\

-Invoke button under the mouse pointer.     \\[Custom-move-and-invoke]
-Invoke button under point.                \\[widget-button-press]
-Set all modifications.                    \\[Custom-set]
-Make all modifications default.                   \\[Custom-save]
-Reset all modified options.               \\[Custom-reset-current]
-Reset all modified or set options.        \\[Custom-reset-saved]
-Reset all options.                        \\[Custom-reset-standard]
+Invoke button under the mouse pointer.     \\[widget-button-click]
+Invoke button under point.                 \\[widget-button-press]
+Set all options from current text.         \\[Custom-set]
+Make values in current text permanent.     \\[Custom-save]
+Make text match actual option values.      \\[Custom-reset-current]
+Reset options to permanent settings.       \\[Custom-reset-saved]
+Erase customizations; set options
+  and buffer text to the standard values.  \\[Custom-reset-standard]

 
 Entry to this mode calls the value of `custom-mode-hook'
 if that value is non-nil."
 
 Entry to this mode calls the value of `custom-mode-hook'
 if that value is non-nil."


@@ -4367,8 +4502,7 @@ if that value is non-nil."
   (make-local-variable 'widget-button-face)
   (setq widget-button-face custom-button)
   (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
   (make-local-variable 'widget-button-face)
   (setq widget-button-face custom-button)
   (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)

-  (if custom-raised-buttons
-      (set (make-local-variable 'widget-mouse-face) custom-button))
+  (set (make-local-variable 'widget-mouse-face) custom-button-mouse)

 
   ;; When possible, use relief for buttons, not bracketing.  This test
   ;; may not be optimal.
 
   ;; When possible, use relief for buttons, not bracketing.  This test
   ;; may not be optimal.