From: Stéphane Boucher <Stephane.Boucher@acceo.com>
Date: Wed, 4 Mar 2020 00:05:55 +0000 (+0200)
Subject: Update default-directory in occur buffer (bug#39608)
X-Git-Tag: emacs-28.0.90~7805
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21ebfa1dd8129420c832031d055c708075aec02c;p=emacs.git

Update default-directory in occur buffer (bug#39608)

* lisp/replace.el (occur-1): Update default-directory in occur buffer.

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/replace.el b/lisp/replace.el
index a0b050637e1..168ccf2f72a 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1576,7 +1576,8 @@ See also `multi-occur'."
                                          (and (overlayp boo)
                                               (overlay-buffer boo)))
                                  boo))
-			   bufs))))
+                           bufs)))
+        (source-buffer-default-directory default-directory))
     ;; Handle the case where one of the buffers we're searching is the
     ;; output buffer.  Just rename it.
     (when (member buf-name
@@ -1593,6 +1594,9 @@ See also `multi-occur'."
     (setq occur-buf (get-buffer-create buf-name))
 
     (with-current-buffer occur-buf
+      ;; Make the default-directory of the *Occur* buffer match that of
+      ;; the buffer where the occurences come from
+      (setq default-directory source-buffer-default-directory)
       (if (stringp nlines)
 	  (fundamental-mode) ;; This is for collect operation.
 	(occur-mode))