From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 4 Feb 2003 10:40:14 +0000 (+0000)
Subject: (find-alternate-file): Handle dired-directory like buffer-file-name.
X-Git-Tag: ttn-vms-21-2-B4~11362
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7906c044c17790794701749fac2a946b3ca75e72;p=emacs.git

(find-alternate-file): Handle dired-directory like buffer-file-name.
---

diff --git a/lisp/files.el b/lisp/files.el
index cb1e0156ed3..070db9f3be4 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -940,6 +940,7 @@ If the current buffer now contains an empty file that you just visited
   (let ((obuf (current-buffer))
 	(ofile buffer-file-name)
 	(onum buffer-file-number)
+	(odir dired-directory)
 	(otrue buffer-file-truename)
 	(oname (buffer-name)))
     (if (get-buffer " **lose**")
@@ -948,9 +949,13 @@ If the current buffer now contains an empty file that you just visited
     (unwind-protect
 	(progn
 	  (unlock-buffer)
+	  ;; This prevents us from finding the same buffer
+	  ;; if we specified the same file again.
 	  (setq buffer-file-name nil)
 	  (setq buffer-file-number nil)
 	  (setq buffer-file-truename nil)
+	  ;; Likewise for dired buffers.
+	  (setq dired-directory nil)
 	  (find-file filename))
       (when (eq obuf (current-buffer))
 	;; This executes if find-file gets an error
@@ -960,6 +965,7 @@ If the current buffer now contains an empty file that you just visited
 	(setq buffer-file-name ofile)
 	(setq buffer-file-number onum)
 	(setq buffer-file-truename otrue)
+	(setq dired-directory odir)
 	(lock-buffer)
 	(rename-buffer oname)))
     (unless (eq (current-buffer) obuf)