# HG changeset patch
# User Lars Hansen <larsh@soem.dk>
# Date 1063004564 0
# Node ID 6d5981c8551c06f8467417464ed0d903a3da7b8d
# Parent  fef189326a955199f2750a2895ad824ec6251506
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 -r fef189326a95 -r 6d5981c8551c lisp/desktop.el
--- a/lisp/desktop.el	Sun Sep 07 22:15:51 2003 +0000
+++ b/lisp/desktop.el	Mon Sep 08 07:02:44 2003 +0000
@@ -834,11 +834,13 @@
       ;; 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)