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

[Juanma Barranquero]

Index: emacs/lisp/apropos.el
diff -c emacs/lisp/apropos.el:1.91 emacs/lisp/apropos.el:1.92
*** emacs/lisp/apropos.el:1.91  Tue Jan 14 15:47:21 2003
--- emacs/lisp/apropos.el       Tue Feb  4 06:00:25 2003
***************
*** 247,253 ****
    (concat "\\("
          (mapconcat 'identity words "\\|")
          "\\)" wild
!         (if (cdr words) 
              (concat "\\("
                      (mapconcat 'identity words "\\|")
                      "\\)")
--- 247,253 ----
    (concat "\\("
          (mapconcat 'identity words "\\|")
          "\\)" wild
!         (if (cdr words)
              (concat "\\("
                      (mapconcat 'identity words "\\|")
                      "\\)")
***************
*** 314,320 ****
        (dolist (s (apropos-calc-scores doc apropos-all-words) score)
          (setq score (+ score 50 (/ (* (- l s) 50) l)))))
        0))
!         
  (defun apropos-score-symbol (symbol &optional weight)
    "Return apropos score for SYMBOL."
    (setq symbol (symbol-name symbol))
--- 314,320 ----
        (dolist (s (apropos-calc-scores doc apropos-all-words) score)
          (setq score (+ score 50 (/ (* (- l s) 50) l)))))
        0))
! 
  (defun apropos-score-symbol (symbol &optional weight)
    "Return apropos score for SYMBOL."
    (setq symbol (symbol-name symbol))
***************
*** 413,419 ****
                     (if (functionp symbol)
                         (if (setq doc (documentation symbol t))
                             (progn
!                              (setq score (+ score (apropos-score-doc doc))) 
                               (substring doc 0 (string-match "\n" doc)))
                           "(not documented)")))
                   (and var-predicate
--- 413,419 ----
                     (if (functionp symbol)
                         (if (setq doc (documentation symbol t))
                             (progn
!                              (setq score (+ score (apropos-score-doc doc)))
                               (substring doc 0 (string-match "\n" doc)))
                           "(not documented)")))
                   (and var-predicate
***************
*** 531,537 ****
        (if (apropos-false-hit-str p)
            (setq p nil))
        (if (or f v p)
!           (setq apropos-accumulator (cons (list symbol 
                                                  (+ (apropos-score-str f)
                                                     (apropos-score-str v)
                                                     (apropos-score-str p))
--- 531,537 ----
        (if (apropos-false-hit-str p)
            (setq p nil))
        (if (or f v p)
!           (setq apropos-accumulator (cons (list symbol
                                                  (+ (apropos-score-str f)
                                                     (apropos-score-str v)
                                                     (apropos-score-str p))
***************
*** 580,586 ****
                                 (setcar (nthcdr 2 apropos-item) v)
                                 (setcar apropos-item (+ (car apropos-item) 
sv)))))
                       (setq apropos-accumulator
!                            (cons (list symbol 
                                         (+ (apropos-score-symbol symbol 2) sf 
sv)
                                         f v)
                                   apropos-accumulator)))))))
--- 580,586 ----
                                 (setcar (nthcdr 2 apropos-item) v)
                                 (setcar apropos-item (+ (car apropos-item) 
sv)))))
                       (setq apropos-accumulator
!                            (cons (list symbol
                                         (+ (apropos-score-symbol symbol 2) sf 
sv)
                                         f v)
                                   apropos-accumulator)))))))
***************
*** 665,671 ****
              (or (and (setq apropos-item (assq symbol apropos-accumulator))
                       (setcar (cdr apropos-item)
                               (+ (cadr apropos-item) (apropos-score-doc doc))))
!                 (setq apropos-item (list symbol 
                                           (+ (apropos-score-symbol symbol 2)
                                              (apropos-score-doc doc))
                                           nil nil)
--- 665,671 ----
              (or (and (setq apropos-item (assq symbol apropos-accumulator))
                       (setcar (cdr apropos-item)
                               (+ (cadr apropos-item) (apropos-score-doc doc))))
!                 (setq apropos-item (list symbol
                                           (+ (apropos-score-symbol symbol 2)
                                              (apropos-score-doc doc))
                                           nil nil)
***************
*** 755,761 ****
  (defun apropos-print (do-keys spacing)
    "Output result of apropos searching into buffer `*Apropos*'.
  The value of `apropos-accumulator' is the list of items to output.
! Each element should have the format 
   (SYMBOL SCORE FN-DOC VAR-DOC [PLIST-DOC WIDGET-DOC FACE-DOC GROUP-DOC]).
  The return value is the list that was in `apropos-accumulator', sorted
  alphabetically by symbol name; but this function also sets
--- 755,761 ----
  (defun apropos-print (do-keys spacing)
    "Output result of apropos searching into buffer `*Apropos*'.
  The value of `apropos-accumulator' is the list of items to output.
! Each element should have the format
   (SYMBOL SCORE FN-DOC VAR-DOC [PLIST-DOC WIDGET-DOC FACE-DOC GROUP-DOC]).
  The return value is the list that was in `apropos-accumulator', sorted
  alphabetically by symbol name; but this function also sets