diff options
| author | Jesper Harder | 2004-05-23 19:08:48 +0000 |
|---|---|---|
| committer | Jesper Harder | 2004-05-23 19:08:48 +0000 |
| commit | f5340e292ca7f4b3526de79a957c4f0b9fd656fb (patch) | |
| tree | 807b163158295573f0c15e0cc70f6b80b7ef60c6 | |
| parent | 71d5a208a41e0982a9565d8cc215bd110fcac864 (diff) | |
| download | emacs-f5340e292ca7f4b3526de79a957c4f0b9fd656fb.tar.gz emacs-f5340e292ca7f4b3526de79a957c4f0b9fd656fb.zip | |
(grep-tree): Ensure that DIR argument is
interpreted as a directory.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aea6e7d6d10..fe0559d07aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2004-05-23 Jesper Harder <harder@ifa.au.dk> | ||
| 2 | |||
| 3 | * progmodes/grep.el (grep-tree): Ensure that DIR argument is | ||
| 4 | interpreted as a directory. | ||
| 5 | |||
| 1 | 2004-05-22 Richard M. Stallman <rms@gnu.org> | 6 | 2004-05-22 Richard M. Stallman <rms@gnu.org> |
| 2 | 7 | ||
| 3 | * textmodes/paragraphs.el (sentence-end): Match unicode curly quotes | 8 | * textmodes/paragraphs.el (sentence-end): Match unicode curly quotes |
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 94937ba1e87..c5e322a657a 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el | |||
| @@ -533,7 +533,8 @@ those sub directories of DIR." | |||
| 533 | (files | 533 | (files |
| 534 | (read-string (concat "Search for \"" regexp "\" in files (default " grep-tree-last-files "): "))) | 534 | (read-string (concat "Search for \"" regexp "\" in files (default " grep-tree-last-files "): "))) |
| 535 | (dir | 535 | (dir |
| 536 | (read-directory-name "Base directory: " nil default-directory t))) | 536 | (file-name-as-directory |
| 537 | (read-directory-name "Base directory: " nil default-directory t)))) | ||
| 537 | (list regexp files dir))) | 538 | (list regexp files dir))) |
| 538 | (unless grep-tree-command | 539 | (unless grep-tree-command |
| 539 | (grep-compute-defaults)) | 540 | (grep-compute-defaults)) |