Tweaks to Customize interface. Set custom-reset-button-menu to t.

* cus-edit.el (custom-commands, custom-reset-menu)
(Custom-reset-standard): Tweak labels.
(custom-reset-button-menu): Change default to t.
(custom-buffer-create-internal): For the custom-reset-button-menu
case, put the revert button first.
(custom-group-subtitle): New face.
(custom-group-value-create): Align docstring to a specific column.

* wid-edit.el (widget-documentation-link-add): Don't handle
indentation in this function.
(widget-documentation-string-indent-to): New function.
(widget-documentation-string-value-create): Use it.

* autorevert.el (auto-revert):
* epg-config.el (epg):
* ibuffer.el (ibuffer):
* mpc.el (mpc):
* ses.el (ses):
* eshell/eshell.el (eshell):
* net/ange-ftp.el (ange-ftp):
* progmodes/ebnf2ps.el (postscript):
* progmodes/flymake.el (flymake):
* progmodes/prolog.el (prolog):
* progmodes/verilog-mode.el (verilog-mode):
* progmodes/which-func.el (which-func):
* textmodes/picture.el (picture):
* textmodes/tildify.el (tildify):
* vc/ediff.el (ediff): Tweak defgroups to improve presentation in
customization buffers.

1 files changed, 24 insertions, 16 deletions

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b6feecebde5..9c5c6462bcc 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -2907,15 +2907,7 @@ link for that string."
               (push (widget-convert-button widget-documentation-link-type
                                            begin end :value name)
                     buttons)))))
-      (widget-put widget :buttons buttons)))
-  (let ((indent (widget-get widget :indent)))
-    (when (and indent (not (zerop indent)))
-      (save-excursion
-        (save-restriction
-          (narrow-to-region from to)
-          (goto-char (point-min))
-          (while (search-forward "\n" nil t)
-            (insert-char ?\s indent)))))))
+      (widget-put widget :buttons buttons))))
 
 ;;; The `documentation-string' Widget.
 
@@ -2934,10 +2926,9 @@ link for that string."
         (start (point)))
     (if (string-match "\n" doc)
         (let ((before (substring doc 0 (match-beginning 0)))
-              (after (substring doc (match-beginning 0)))
-              button)
-          (when (and indent (not (zerop indent)))
-            (insert-char ?\s indent))
+              (after (substring doc (match-end 0)))
+              button end)
+          (widget-documentation-string-indent-to indent)
           (insert before ?\s)
           (widget-documentation-link-add widget start (point))
           (setq button
@@ -2950,18 +2941,35 @@ link for that string."
                  :action 'widget-parent-action
                  shown))
           (when shown
+            (insert ?\n)
             (setq start (point))
             (when (and indent (not (zerop indent)))
               (insert-char ?\s indent))
             (insert after)
-            (widget-documentation-link-add widget start (point)))
+            (setq end (point))
+            (widget-documentation-link-add widget start end)
+            ;; Indent the subsequent lines.
+            (when (and indent (> indent 0))
+              (save-excursion
+                (save-restriction
+                  (narrow-to-region start end)
+                  (goto-char (point-min))
+                  (while (search-forward "\n" nil t)
+                    (widget-documentation-string-indent-to indent))))))
           (widget-put widget :buttons (list button)))
-      (when (and indent (not (zerop indent)))
-        (insert-char ?\s indent))
+      (widget-documentation-string-indent-to indent)
       (insert doc)
       (widget-documentation-link-add widget start (point))))
   (insert ?\n))
 
+(defun widget-documentation-string-indent-to (col)
+  (when (and (numberp col)
+             (> col 0))
+    (let ((opoint (point)))
+      (indent-to col)
+      (put-text-property opoint (point)
+                         'display `(space :align-to ,col)))))
+
 (defun widget-documentation-string-action (widget &rest _ignore)
   ;; Toggle documentation.
   (let ((parent (widget-get widget :parent)))