(dired-clean-up-after-deletion): Expand fn.

(dired-find-buffer-nocreate): Expand dir at beginning.

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 6b24f99a7df17f60c80f74da2d0668549bf9dfe5..2594d1c6d5406a1ac2688f5757a8da8f7ab72b2b 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -301,7 +301,7 @@ See also functions
                                 (file-name-nondirectory fn)))
                (save-excursion ; you never know where kill-buffer leaves you
                  (kill-buffer buf))))
-        (let ((buf-list (dired-buffers-for-dir fn))
+        (let ((buf-list (dired-buffers-for-dir (expand-file-name fn)))
               (buf nil))
           (and buf-list
                (y-or-n-p (format "Kill dired buffer%s of %s, too? "
@@ -1364,7 +1364,8 @@ See also variable `dired-vm-read-only-folders'."
 (defun dired-find-buffer-nocreate (dirname)
   (if dired-find-subdir
       (let* ((cur-buf (current-buffer))
-             (buffers (nreverse (dired-buffers-for-dir dirname)))
+             (buffers (nreverse
+                      (dired-buffers-for-dir (expand-file-name dirname))))
              (cur-buf-matches (and (memq cur-buf buffers)
                                    ;; wildcards must match, too:
                                    (equal dired-directory dirname))))