[Emacs-diffs] Changes to emacs/lisp/progmodes/grep.el

[Kim F. Storm]

Index: emacs/lisp/progmodes/grep.el
diff -u emacs/lisp/progmodes/grep.el:1.52 emacs/lisp/progmodes/grep.el:1.53
--- emacs/lisp/progmodes/grep.el:1.52   Fri Apr 28 22:22:01 2006
+++ emacs/lisp/progmodes/grep.el        Fri Apr 28 23:39:02 2006
@@ -599,10 +599,13 @@
 
 (defun grep-read-files (regexp)
   "Read files arg for interactive grep."
-  (let* ((default
-          (or (and (stringp (buffer-file-name))
-                   (let ((fn (file-name-nondirectory (buffer-file-name)))
-                         (aliases grep-files-aliases)
+  (let* ((bn (or (buffer-file-name) (buffer-name)))
+        (fn (and bn
+                 (stringp bn)
+                 (file-name-nondirectory bn)))
+        (default
+          (or (and fn
+                   (let ((aliases grep-files-aliases)
                          alias)
                      (while aliases
                        (setq alias (car aliases)
@@ -611,10 +614,14 @@
                            (setq aliases nil)
                          (setq alias nil)))
                      (cdr alias)))
-              (car grep-files-history)))
+              (and fn
+                   (let ((ext (file-name-extension fn)))
+                     (and ext (concat "*." ext))))))
         (files (read-string
                 (concat "Search for \"" regexp
-                        "\" in files (default " default "): ")
+                        "\" in files"
+                        (if default (concat " (default " default ")"))
+                        ": ")
                 nil 'grep-files-history default)))
     (and files
         (or (cdr (assoc files grep-files-aliases))