summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2004-05-28 21:07:47 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2004-05-28 21:07:47 +0000
commit757b1dc9f48f26cae2c3ecff45b5f06a28bc242e (patch)
tree9897728da9771a1c9eb6fe9683b94bb56581a959 /lisp/progmodes
parentff4ccb8e9269881e285b02ad79eb422543413aa3 (diff)
downloademacs-757b1dc9f48f26cae2c3ecff45b5f06a28bc242e.tar.gz
(grep-tree): Rework previous fix.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/grep.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index c5e322a657a..aa81f8aa770 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -533,8 +533,7 @@ those sub directories of DIR."
(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 @@ those sub directories of DIR."
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)))