2 files changed, 19 insertions, 2 deletions

diff --git a/lisp/dired.el b/lisp/dired.el
index 4c2c3f44e72..63082fe3927 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -774,6 +774,15 @@ as an argument to `dired-goto-file'."
           (file-name-as-directory (abbreviate-file-name filename))
         (abbreviate-file-name filename)))))
 
+(defun dired-grep-read-files ()
+  "Use file at point as the file for grep's default file-name pattern suggestion.
+If a directory or nothing is found at point, return nil."
+  (let ((file-name (dired-file-name-at-point)))
+    (if (and file-name
+             (not (file-directory-p file-name)))
+        file-name)))
+(put 'dired-mode 'grep-read-files 'dired-grep-read-files)
+
 ;;;###autoload (define-key ctl-x-map "d" 'dired)
 ;;;###autoload
 (defun dired (dirname &optional switches)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index c0f47159c95..8c7a58fd8bd 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -959,8 +959,16 @@ substitution string.  Note dynamic scoping of variables.")
 The pattern can include shell wildcards.  As whitespace triggers
 completion when entering a pattern, including it requires
 quoting, e.g. `\\[quoted-insert]<space>'."
-  (let* ((bn (or (buffer-file-name)
-                 (replace-regexp-in-string "<[0-9]+>\\'" "" (buffer-name))))
+  (let* ((grep-read-files-function (get major-mode 'grep-read-files))
+         (file-name-at-point
+           (run-hook-with-args-until-success 'file-name-at-point-functions))
+         (bn (if grep-read-files-function
+                 (funcall grep-read-files-function)
+               (or (if (and (stringp file-name-at-point)
+                            (not (file-directory-p file-name-at-point)))
+                       file-name-at-point)
+                   (buffer-file-name)
+                   (replace-regexp-in-string "<[0-9]+>\\'" "" (buffer-name)))))
          (fn (and bn
                   (stringp bn)
                   (file-name-nondirectory bn)))