# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1085778467 0
# Node ID 9766648e58a2f526590e81ecc65733d16abf53ca
# Parent  9070d5f984ea207675a1ce17cec6e59fd3e7378f
(grep-tree): Rework previous fix.

diff -r 9070d5f984ea -r 9766648e58a2 lisp/progmodes/grep.el
--- a/lisp/progmodes/grep.el	Fri May 28 21:06:26 2004 +0000
+++ b/lisp/progmodes/grep.el	Fri May 28 21:07:47 2004 +0000
@@ -533,8 +533,7 @@
 	  (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))))
+	   (read-directory-name "Base directory: " nil default-directory t)))
      (list regexp files dir)))
   (unless grep-tree-command
     (grep-compute-defaults))
@@ -556,7 +555,7 @@
 			 nil)  ;; we change default-directory to dir
 		       (and grep-tree-ignore-CVS-directories "-path '*/CVS' -prune -o ")
 		       grep-tree-ignore-case))
-	(default-directory dir)
+	(default-directory (file-name-as-directory (expand-file-name dir)))
 	(null-device nil))		; see grep
     (grep command-args regexp)))