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

[Stefan Monnier]

Index: emacs/lisp/progmodes/grep.el
diff -c emacs/lisp/progmodes/grep.el:1.13 emacs/lisp/progmodes/grep.el:1.14
*** emacs/lisp/progmodes/grep.el:1.13   Sun May 23 19:08:37 2004
--- emacs/lisp/progmodes/grep.el        Fri May 28 21:07:47 2004
***************
*** 533,540 ****
          (files
           (read-string (concat "Search for \"" regexp "\" in files (default "  
 grep-tree-last-files  "): ")))
          (dir
!          (file-name-as-directory
!           (read-directory-name "Base directory: " nil default-directory t))))
       (list regexp files dir)))
    (unless grep-tree-command
      (grep-compute-defaults))
--- 533,539 ----
          (files
           (read-string (concat "Search for \"" regexp "\" in files (default "  
 grep-tree-last-files  "): ")))
          (dir
!          (read-directory-name "Base directory: " nil default-directory t)))
       (list regexp files dir)))
    (unless grep-tree-command
      (grep-compute-defaults))
***************
*** 556,562 ****
                         nil)  ;; we change default-directory to dir
                       (and grep-tree-ignore-CVS-directories "-path '*/CVS' 
-prune -o ")
                       grep-tree-ignore-case))
!       (default-directory dir)
        (null-device nil))              ; see grep
      (grep command-args regexp)))
  
--- 555,561 ----
                         nil)  ;; we change default-directory to dir
                       (and grep-tree-ignore-CVS-directories "-path '*/CVS' 
-prune -o ")
                       grep-tree-ignore-case))
!       (default-directory (file-name-as-directory (expand-file-name dir)))
        (null-device nil))              ; see grep
      (grep command-args regexp)))