diff options
| author | Juri Linkov | 2009-12-07 17:35:47 +0000 |
|---|---|---|
| committer | Juri Linkov | 2009-12-07 17:35:47 +0000 |
| commit | 9136e895236df7ca44c13aca1cc0bdc3408186ab (patch) | |
| tree | f03c92481fad197462aca0c0b0a3ac025c5ad53f | |
| parent | 406374109c9df9fd1a2143f0001fe21562e9644a (diff) | |
| download | emacs-9136e895236df7ca44c13aca1cc0bdc3408186ab.tar.gz emacs-9136e895236df7ca44c13aca1cc0bdc3408186ab.zip | |
(grep-read-files): Use `completing-read'
instead of `read-string'. Set its `collection' arg to
`read-file-name-internal'. (Bug#4301)
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 464ca87b90b..01096305437 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2009-12-07 Juri Linkov <juri@jurta.org> | 1 | 2009-12-07 Juri Linkov <juri@jurta.org> |
| 2 | 2 | ||
| 3 | * progmodes/grep.el (grep-read-files): Use `completing-read' | ||
| 4 | instead of `read-string'. Set its `collection' arg to | ||
| 5 | `read-file-name-internal'. (Bug#4301) | ||
| 6 | |||
| 7 | 2009-12-07 Juri Linkov <juri@jurta.org> | ||
| 8 | |||
| 3 | Correctly restore original Isearch point. (Bug#4994) | 9 | Correctly restore original Isearch point. (Bug#4994) |
| 4 | 10 | ||
| 5 | * isearch.el (isearch-mode): Move `isearch-push-state' after | 11 | * isearch.el (isearch-mode): Move `isearch-push-state' after |
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 1b47d30b703..52bb0e91d2c 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el | |||
| @@ -799,12 +799,13 @@ substitution string. Note dynamic scoping of variables.") | |||
| 799 | default-extension | 799 | default-extension |
| 800 | (car grep-files-history) | 800 | (car grep-files-history) |
| 801 | (car (car grep-files-aliases)))) | 801 | (car (car grep-files-aliases)))) |
| 802 | (files (read-string | 802 | (files (completing-read |
| 803 | (concat "Search for \"" regexp | 803 | (concat "Search for \"" regexp |
| 804 | "\" in files" | 804 | "\" in files" |
| 805 | (if default (concat " (default " default ")")) | 805 | (if default (concat " (default " default ")")) |
| 806 | ": ") | 806 | ": ") |
| 807 | nil 'grep-files-history | 807 | 'read-file-name-internal |
| 808 | nil nil nil 'grep-files-history | ||
| 808 | (delete-dups | 809 | (delete-dups |
| 809 | (delq nil (append (list default default-alias default-extension) | 810 | (delq nil (append (list default default-alias default-extension) |
| 810 | (mapcar 'car grep-files-aliases))))))) | 811 | (mapcar 'car grep-files-aliases))))))) |