aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorLars Hansen <[email protected]>2003-09-08 07:02:44 +0000
committerLars Hansen <[email protected]>2003-09-08 07:02:44 +0000
commit16dbbed6b98f8c358891f6b9f2bccbb24aa9c302 (patch)
treed6d106b5d0e0530821bef89639b5c55f2d730d2c /lisp/desktop.el
parentf2daf7e9484b1fac9b642b24cd7a16a444e6b66e (diff)
2003-09-08 Lars Hansen <[email protected]>
* desktop.el (desktop-buffer-dired): Change name of local variable to be different from buffer local variable `dired-directory'.
Diffstat (limited to 'lisp/desktop.el')
-rw-r--r--lisp/desktop.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index a681697ea8..3cf839d154 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)