[Emacs-diffs] Changes to emacs/lisp/apropos.el

[Richard M. Stallman]

Index: emacs/lisp/apropos.el
diff -c emacs/lisp/apropos.el:1.81 emacs/lisp/apropos.el:1.82
*** emacs/lisp/apropos.el:1.81  Fri Nov 16 13:30:25 2001
--- emacs/lisp/apropos.el       Fri Dec 21 20:36:37 2001
***************
*** 386,392 ****
        (if (or f v p)
            (setq apropos-accumulator (cons (list symbol f v p)
                                            apropos-accumulator))))))
!   (apropos-print nil t))
  
  
  ;;;###autoload
--- 386,392 ----
        (if (or f v p)
            (setq apropos-accumulator (cons (list symbol f v p)
                                            apropos-accumulator))))))
!   (apropos-print nil "\n----------------\n"))
  
  
  ;;;###autoload
***************
*** 424,430 ****
                       (setq apropos-accumulator
                             (cons (list symbol f v)
                                   apropos-accumulator)))))))
!         (apropos-print nil t))
        (kill-buffer standard-input))))
  
  
--- 424,430 ----
                       (setq apropos-accumulator
                             (cons (list symbol f v)
                                   apropos-accumulator)))))))
!         (apropos-print nil "\n----------------\n"))
        (kill-buffer standard-input))))
  
  
***************
*** 585,591 ****
  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."
    (if (null apropos-accumulator)
        (message "No apropos matches for `%s'" apropos-regexp)
      (setq apropos-accumulator
--- 585,594 ----
  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.
! 
! 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,612 ****
                (substitute-command-keys
                 "and type \\[apropos-follow] to get full documentation.\n\n"))
        (while (consp p)
!         (or (not spacing) (bobp) (terpri))
          (setq apropos-item (car p)
                symbol (car apropos-item)
                p (cdr p))
--- 609,616 ----
                (substitute-command-keys
                 "and type \\[apropos-follow] to get full documentation.\n\n"))
        (while (consp p)
!         (when (and spacing (not (bobp)))
!           (princ spacing))
          (setq apropos-item (car p)
                symbol (car apropos-item)
                p (cdr p))