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

[Kim F . Storm]

Index: emacs/lisp/apropos.el
diff -c emacs/lisp/apropos.el:1.110 emacs/lisp/apropos.el:1.111
*** emacs/lisp/apropos.el:1.110 Wed Nov 16 22:11:47 2005
--- emacs/lisp/apropos.el       Tue Nov 29 23:52:59 2005
***************
*** 301,307 ****
  
  (defun apropos-parse-pattern (pattern)
    "Rewrite a list of words to a regexp matching all permutations.
! If PATTERN is a string, that means it is already a regexp."
    (setq apropos-words nil
        apropos-all-words nil)
    (if (consp pattern)
--- 301,309 ----
  
  (defun apropos-parse-pattern (pattern)
    "Rewrite a list of words to a regexp matching all permutations.
! If PATTERN is a string, that means it is already a regexp.
! This updates variables `apropos-pattern', `apropos-pattern-quoted',
! `apropos-regexp', `apropos-words', and `apropos-all-words-regexp'."
    (setq apropos-words nil
        apropos-all-words nil)
    (if (consp pattern)
***************
*** 325,335 ****
                (setq syn (cdr syn))))
            (setq apropos-words (cons s apropos-words)
                  apropos-all-words (cons a apropos-all-words))))
!       (setq apropos-all-words-regexp (apropos-words-to-regexp 
apropos-all-words ".+"))
!       (apropos-words-to-regexp apropos-words ".*?"))
      (setq apropos-pattern-quoted (regexp-quote pattern)
          apropos-all-words-regexp pattern
!         apropos-pattern pattern)))
  
  
  (defun apropos-calc-scores (str words)
--- 327,340 ----
                (setq syn (cdr syn))))
            (setq apropos-words (cons s apropos-words)
                  apropos-all-words (cons a apropos-all-words))))
!       (setq apropos-all-words-regexp
!             (apropos-words-to-regexp apropos-all-words ".+"))
!       (setq apropos-regexp
!             (apropos-words-to-regexp apropos-words ".*?")))
      (setq apropos-pattern-quoted (regexp-quote pattern)
          apropos-all-words-regexp pattern
!         apropos-pattern pattern
!         apropos-regexp pattern)))
  
  
  (defun apropos-calc-scores (str words)
***************
*** 442,448 ****
                      (if (or current-prefix-arg apropos-do-all)
                          "command or function" "command"))
                     current-prefix-arg))
!   (setq apropos-regexp (apropos-parse-pattern pattern))
    (let ((message
         (let ((standard-output (get-buffer-create "*Apropos*")))
           (print-help-return-message 'identity))))
--- 447,453 ----
                      (if (or current-prefix-arg apropos-do-all)
                          "command or function" "command"))
                     current-prefix-arg))
!   (apropos-parse-pattern pattern)
    (let ((message
         (let ((standard-output (get-buffer-create "*Apropos*")))
           (print-help-return-message 'identity))))
***************
*** 508,514 ****
  time-consuming.  Returns list of symbols and documentation found."
    (interactive (list (apropos-read-pattern "symbol")
                     current-prefix-arg))
!   (setq apropos-regexp (apropos-parse-pattern pattern))
    (apropos-symbols-internal
     (apropos-internal apropos-regexp
                          (and (not do-all)
--- 513,519 ----
  time-consuming.  Returns list of symbols and documentation found."
    (interactive (list (apropos-read-pattern "symbol")
                     current-prefix-arg))
!   (apropos-parse-pattern pattern)
    (apropos-symbols-internal
     (apropos-internal apropos-regexp
                          (and (not do-all)
***************
*** 577,583 ****
  Returns list of symbols and values found."
    (interactive (list (apropos-read-pattern "value")
                     current-prefix-arg))
!   (setq apropos-regexp (apropos-parse-pattern pattern))
    (or do-all (setq do-all apropos-do-all))
    (setq apropos-accumulator ())
     (let (f v p)
--- 582,588 ----
  Returns list of symbols and values found."
    (interactive (list (apropos-read-pattern "value")
                     current-prefix-arg))
!   (apropos-parse-pattern pattern)
    (or do-all (setq do-all apropos-do-all))
    (setq apropos-accumulator ())
     (let (f v p)
***************
*** 623,629 ****
  Returns list of symbols and documentation found."
    (interactive (list (apropos-read-pattern "documentation")
                     current-prefix-arg))
!   (setq apropos-regexp (apropos-parse-pattern pattern))
    (or do-all (setq do-all apropos-do-all))
    (setq apropos-accumulator () apropos-files-scanned ())
    (let ((standard-input (get-buffer-create " apropos-temp"))
--- 628,634 ----
  Returns list of symbols and documentation found."
    (interactive (list (apropos-read-pattern "documentation")
                     current-prefix-arg))
!   (apropos-parse-pattern pattern)
    (or do-all (setq do-all apropos-do-all))
    (setq apropos-accumulator () apropos-files-scanned ())
    (let ((standard-input (get-buffer-create " apropos-temp"))