mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-18 11:50:38 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* 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
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/desktop.el
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'. ;; First element of `desktop-buffer-misc' is the value of `dired-directory'.
;; This value is a directory name, optionally with with shell wildcard or ;; This value is a directory name, optionally with with shell wildcard or
;; a directory name followed by list of files. ;; a directory name followed by list of files.
(let* ((dired-directory (car desktop-buffer-misc)) (let* ((dired-dir (car desktop-buffer-misc))
(dir (if (consp dired-directory) (car dired-directory) dired-directory))) (dir (if (consp dired-dir) (car dired-dir) dired-dir)))
(if (file-directory-p (file-name-directory dir)) (if (file-directory-p (file-name-directory dir))
(progn (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)) (mapcar 'dired-maybe-insert-subdir (cdr desktop-buffer-misc))
(current-buffer)) (current-buffer))
(message "Directory %s no longer exists." dir) (message "Directory %s no longer exists." dir)