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

diff --git a/lisp/files.el b/lisp/files.el
index cb1e0156ed3c825f0cc7e3dc3bd23a5a2403623e..070db9f3be440d95da9411b49c301f8b26b3af2b 100644 (file)
--- 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)