lisp/apropos.el: Avoid formatting error in compact layout mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12481eff13968c52ebb2c319459b2d122d6c463e..1e974b1525ae31dc30cd993f045df50667af98e8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-24  Juanma Barranquero  <lekktu@gmail.com>
+
+       * apropos.el (apropos-print): Avoid formatting error when
+       apropos-do-all and apropos-compact-layout are both t.
+
 2014-02-23  Juanma Barranquero  <lekktu@gmail.com>
 
        * apropos.el (apropos-property, apropos-all-words-regexp)

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 47e44485c627a55165c5b633f4781f74befc5a6b..2cba65e95598281ecf4321299f2b02285b871f6e 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1052,6 +1052,7 @@ If non-nil, TEXT is a string that will be printed as a heading."
       (let ((p apropos-accumulator)
            (old-buffer (current-buffer))
            (inhibit-read-only t)
+           (button-end 0)
            symbol item)
        (set-buffer standard-output)
        (apropos-mode)
@@ -1069,10 +1070,12 @@ If non-nil, TEXT is a string that will be printed as a heading."
              (setq apropos-item
                    (cons (car apropos-item)
                          (cons nil (cdr apropos-item)))))
+         (when (= (point) button-end) (terpri))
          (insert-text-button (symbol-name symbol)
                              'type 'apropos-symbol
                              'skip apropos-multi-type
                              'face 'apropos-symbol)
+         (setq button-end (point))
          (if (and (eq apropos-sort-by-scores 'verbose)
                   (cadr apropos-item))
              (insert " (" (number-to-string (cadr apropos-item)) ") "))