(dired-mode): Handle dired-directory as a list.

diff --git a/lisp/dired.el b/lisp/dired.el
index 8919b7c97ca47a89c6e1d0d5de25fdf56a94dc58..c3c4188aba7c07be925187b8e95eac9458c62bd6 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1285,7 +1285,9 @@ Keybindings:
        (or dirname default-directory))
   ;; list-buffers uses this to display the dir being edited in this buffer.
   (set (make-local-variable 'list-buffers-directory)
-       (expand-file-name dired-directory))
+       (expand-file-name (if (listp dired-directory)
+                            (car dired-directory)
+                          dired-directory)))
   (set (make-local-variable 'dired-actual-switches)
        (or switches dired-listing-switches))
   (set (make-local-variable 'font-lock-defaults) '(dired-font-lock-keywords t))