From 7d4bd627de08252c130f66858e486416878850e0 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 24 Feb 2014 03:38:54 +0100 Subject: [PATCH] lisp/apropos.el: Avoid formatting error in compact layout mode. --- lisp/ChangeLog | 5 +++++ lisp/apropos.el | 3 +++ 2 files changed, 8 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12481eff139..1e974b1525a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-02-24 Juanma Barranquero + + * apropos.el (apropos-print): Avoid formatting error when + apropos-do-all and apropos-compact-layout are both t. + 2014-02-23 Juanma Barranquero * apropos.el (apropos-property, apropos-all-words-regexp) diff --git a/lisp/apropos.el b/lisp/apropos.el index 47e44485c62..2cba65e9559 100644 --- 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)) ") ")) -- 2.39.2