(apropos-print): SPACING is now nil or a separator string.

(apropos-documentation, apropos-value): Pass a suitable string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22cb7391651ce22cc4a1c49c123dd99389b8f3e0..e2277fe5c771ad88e54406376803e608f983a30b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-21  Richard M. Stallman  <rms@gnu.org>
+
+       * apropos.el (apropos-print): SPACING is now nil or a separator string.
+       (apropos-documentation, apropos-value): Pass a suitable string.
+
 2001-12-21  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * dired.el (dired-free-space-program, dired-free-space-args):

diff --git a/lisp/apropos.el b/lisp/apropos.el
index fa3be6f0a5c50f76ecaaa61b7e1700ba77132d40..3ad41627ece7b6f1f787fb3ab7bc713ed28de5ab 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -386,7 +386,7 @@ Returns list of symbols and values found."
        (if (or f v p)
            (setq apropos-accumulator (cons (list symbol f v p)
                                            apropos-accumulator))))))
-  (apropos-print nil t))
+  (apropos-print nil "\n----------------\n"))
 
 
 ;;;###autoload
@@ -424,7 +424,7 @@ Returns list of symbols and documentation found."
                       (setq apropos-accumulator
                             (cons (list symbol f v)
                                   apropos-accumulator)))))))
-         (apropos-print nil t))
+         (apropos-print nil "\n----------------\n"))
       (kill-buffer standard-input))))
 
 \f
@@ -585,7 +585,10 @@ The value of `apropos-accumulator' is the list of items to output.
 Each element should have the format (SYMBOL FN-DOC VAR-DOC [PLIST-DOC]).
 The return value is the list that was in `apropos-accumulator', sorted
 alphabetically by symbol name; but this function also sets
-`apropos-accumulator' to nil before returning."
+`apropos-accumulator' to nil before returning.
+
+If SPACING is non-nil, it should be a string;
+separate items with that string."
   (if (null apropos-accumulator)
       (message "No apropos matches for `%s'" apropos-regexp)
     (setq apropos-accumulator
@@ -606,7 +609,8 @@ alphabetically by symbol name; but this function also sets
                (substitute-command-keys
                 "and type \\[apropos-follow] to get full documentation.\n\n"))
        (while (consp p)
-         (or (not spacing) (bobp) (terpri))
+         (when (and spacing (not (bobp)))
+           (princ spacing))
          (setq apropos-item (car p)
                symbol (car apropos-item)
                p (cdr p))