Make C-u M-x apropos-user-option include buttons

* lisp/apropos.el (apropos-user-option): Include buttons in the
output always (bug#55376).
(apropos-print-doc): Don't insert three spaces in the
non-apropos-multi-type case.

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 28184476e688adc71c04937fea4aee0874c6faf8..c57ca37e68717c1282ebed752b3f2ad6fcd173b1 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -518,7 +518,7 @@ variables, not just user options."
                      (if (or current-prefix-arg apropos-do-all)
                          "variable" "user option"))
                      current-prefix-arg))
-  (apropos-command pattern nil
+  (apropos-command pattern (or do-all apropos-do-all)
                   (if (or do-all apropos-do-all)
                        (lambda (symbol)
                          (and (boundp symbol)
@@ -1275,12 +1275,13 @@ as a heading."
   (let ((doc (nth i apropos-item)))
     (when (stringp doc)
       (if apropos-compact-layout
-         (insert (propertize "\t" 'display '(space :align-to 32)) " ")
-       (insert "  "))
+          (insert (propertize "\t" 'display '(space :align-to 32)))
+        (insert " "))
       (if apropos-multi-type
          (let ((button-face (button-type-get type 'face)))
            (unless (consp button-face)
              (setq button-face (list button-face)))
+            (insert " ")
            (insert-text-button
             (if apropos-compact-layout
                 (format "<%s>" (button-type-get type 'apropos-short-label))