2003-09-08 Lars Hansen <larsh@math.ku.dk>

	* desktop.el (desktop-buffer-dired): Change name of local variable
	to be different from buffer local variable `dired-directory'.

diff --git a/lisp/desktop.el b/lisp/desktop.el
index a681697ea86146697efa1c0a6bed7b05208a7a52..3cf839d154960cfd6157e4f3be6e74de9de1d3d0 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -834,11 +834,13 @@ This function always sets `desktop-enable' to t."
       ;; First element of `desktop-buffer-misc' is the value of `dired-directory'.
       ;; This value is a directory name, optionally with with shell wildcard or
       ;; a directory name followed by list of files.
-      (let* ((dired-directory (car desktop-buffer-misc))
-            (dir (if (consp dired-directory) (car dired-directory) dired-directory)))
+      (let* ((dired-dir (car desktop-buffer-misc))
+            (dir (if (consp dired-dir) (car dired-dir) dired-dir)))
        (if (file-directory-p (file-name-directory dir))
            (progn
-             (dired dired-directory)
+             (dired dired-dir)
+              ;; The following elements of `desktop-buffer-misc' are the keys
+              ;; from `dired-subdir-alist'.
              (mapcar 'dired-maybe-insert-subdir (cdr desktop-buffer-misc))
              (current-buffer))
          (message "Directory %s no longer exists." dir)