[Emacs-diffs] trunk r116542: lisp/apropos.el: Avoid formatting error in compact layout mode.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116542
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2014-02-24 03:38:54 +0100
message:
  lisp/apropos.el: Avoid formatting error in compact layout mode.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/apropos.el                apropos.el-20091113204419-o5vbwnq5f7feedwu-273

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-23 23:41:17 +0000
+++ b/lisp/ChangeLog    2014-02-24 02:38:54 +0000
@@ -1,3 +1,8 @@
+2014-02-24  Juanma Barranquero  <address@hidden>
+
+       * apropos.el (apropos-print): Avoid formatting error when
+       apropos-do-all and apropos-compact-layout are both t.
+
 2014-02-23  Juanma Barranquero  <address@hidden>
 
        * apropos.el (apropos-property, apropos-all-words-regexp)

=== modified file 'lisp/apropos.el'
--- a/lisp/apropos.el   2014-02-23 23:41:17 +0000
+++ b/lisp/apropos.el   2014-02-24 02:38:54 +0000
@@ -1052,6 +1052,7 @@
       (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 @@
              (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)) ") "))