1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00

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'.
This commit is contained in:
Lars Hansen 2003-09-08 07:02:44 +00:00
parent f2daf7e948
commit 16dbbed6b9

View File

@ -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)