diff options
| author | Juri Linkov <juri@jurta.org> | 2009-12-07 17:35:47 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2009-12-07 17:35:47 +0000 |
| commit | 9136e895236df7ca44c13aca1cc0bdc3408186ab (patch) | |
| tree | f03c92481fad197462aca0c0b0a3ac025c5ad53f | |
| parent | 406374109c9df9fd1a2143f0001fe21562e9644a (diff) | |
| download | emacs-9136e895236df7ca44c13aca1cc0bdc3408186ab.tar.gz | |
(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 @@ 2009-12-07 Juri Linkov <juri@jurta.org> + * progmodes/grep.el (grep-read-files): Use `completing-read' + instead of `read-string'. Set its `collection' arg to + `read-file-name-internal'. (Bug#4301) + +2009-12-07 Juri Linkov <juri@jurta.org> + Correctly restore original Isearch point. (Bug#4994) * 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.") default-extension (car grep-files-history) (car (car grep-files-aliases)))) - (files (read-string + (files (completing-read (concat "Search for \"" regexp "\" in files" (if default (concat " (default " default ")")) ": ") - nil 'grep-files-history + 'read-file-name-internal + nil nil nil 'grep-files-history (delete-dups (delq nil (append (list default default-alias default-extension) (mapcar 'car grep-files-aliases))))))) |