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

[Kim F. Storm]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.256 
emacs/lisp/progmodes/compile.el:1.257
*** emacs/lisp/progmodes/compile.el:1.256       Thu May 30 18:11:29 2002
--- emacs/lisp/progmodes/compile.el     Fri Jun 14 09:58:28 2002
***************
*** 860,873 ****
  (defvar grep-tree-last-regexp "")
  (defvar grep-tree-last-files (car (car grep-tree-files-aliases)))
  
! (defun grep-tree (regexp files dir)
!   "Grep in directory tree with simplified prompting for search parameters.
  Collect output in a buffer.
  While find runs asynchronously, you can use the \\[next-error] command
  to find the text that grep hits refer to.
  
  This command uses a special history list for its arguments, so you can
! easily repeat a find command."
    (interactive
     (let* ((regexp
           (if current-prefix-arg
--- 860,882 ----
  (defvar grep-tree-last-regexp "")
  (defvar grep-tree-last-files (car (car grep-tree-files-aliases)))
  
! (defun grep-tree (regexp files dir &optional subdirs)
!   "Grep for REGEXP in FILES in directory tree rooted at DIR.
  Collect output in a buffer.
+ Interactively, prompt separately for each search parameter.
+ With prefix arg, reuse previous REGEXP.
+ The search is limited to file names matching shell pattern FILES.
+ FILES may use abbreviations defined in `grep-tree-files-aliases', e.g.
+ entering `ch' is equivalent to `*.[ch]'.
+ 
  While find runs asynchronously, you can use the \\[next-error] command
  to find the text that grep hits refer to.
  
  This command uses a special history list for its arguments, so you can
! easily repeat a find command.
! 
! When used non-interactively, optional arg SUBDIRS limits the search to
! those sub directories of DIR."
    (interactive
     (let* ((regexp
           (if current-prefix-arg
***************
*** 896,902 ****
                       grep-tree-command
                       (setq grep-tree-last-regexp regexp)
                       (and files (concat "-name '" files "'"))
!                      nil  ;; we change default-directory to dir 
                       (and grep-tree-ignore-CVS-directories "-path '*/CVS' 
-prune -o ")
                       grep-tree-ignore-case))
        (default-directory dir)
--- 905,915 ----
                       grep-tree-command
                       (setq grep-tree-last-regexp regexp)
                       (and files (concat "-name '" files "'"))
!                      (if subdirs
!                          (if (stringp subdirs)
!                              subdirs
!                            (mapconcat 'identity subdirs " "))
!                        nil)  ;; we change default-directory to dir 
                       (and grep-tree-ignore-CVS-directories "-path '*/CVS' 
-prune -o ")
                       grep-tree-ignore-case))
        (default-directory dir)