From: Lars Hansen Date: Mon, 8 Sep 2003 07:02:44 +0000 (+0000) Subject: 2003-09-08 Lars Hansen X-Git-Tag: ttn-vms-21-2-B4~8880 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16dbbed6b98f8c358891f6b9f2bccbb24aa9c302;p=emacs.git 2003-09-08 Lars Hansen * 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 a681697ea86..3cf839d1549 100644 --- 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)