[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.57 emacs/lisp/progmodes/grep.el:1.58
--- emacs/lisp/progmodes/grep.el:1.57   Mon May  8 10:26:30 2006
+++ emacs/lisp/progmodes/grep.el        Tue May  9 12:47:12 2006
@@ -721,16 +721,16 @@
     (if (null files)
        (if (not (string= regexp grep-find-command))
            (compilation-start regexp 'grep-mode))
-      (let* ((default-directory (file-name-as-directory (expand-file-name 
dir)))
-            (command (grep-expand-template
-                      grep-find-template
-                      regexp
-                      (concat "\\( -name "
-                              (mapconcat #'shell-quote-argument
-                                         (split-string files)
-                                         " -o -name ")
-                              " \\)")
-                      default-directory
+      (setq dir (file-name-as-directory (expand-file-name dir)))
+      (let ((command (grep-expand-template
+                     grep-find-template
+                     regexp
+                     (concat "\\( -name "
+                             (mapconcat #'shell-quote-argument
+                                        (split-string files)
+                                        " -o -name ")
+                             " \\)")
+                      dir
                       (and grep-find-ignored-directories
                            (concat "\\( -path '*/"
                                    (mapconcat #'identity
@@ -743,7 +743,11 @@
                    (read-from-minibuffer "Confirm: "
                                          command nil nil 'grep-find-history))
            (add-to-history 'grep-find-history command))
-         (compilation-start command 'grep-mode))))))
+         (let ((default-directory dir))
+           (compilation-start command 'grep-mode))
+         ;; Set default-directory if we started rgrep in the *grep* buffer.
+         (if (eq next-error-last-buffer (current-buffer))
+             (setq default-directory dir)))))))
 
 
 (provide 'grep)