comparison lisp/desktop.el @ 52457:6d5981c8551c

2003-09-08 Lars Hansen <[e-mail]> * desktop.el (desktop-buffer-dired): Change name of local variable to be different from buffer local variable `dired-directory'.

52456:fef189326a95

(defun desktop-buffer-dired () "Load a directory using dired."
  (if (eq 'dired-mode desktop-buffer-major-mode)
      ;; 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)))
	(if (file-directory-p (file-name-directory dir))
	    (progn
	      (dired dired-directory)
	      (mapcar 'dired-maybe-insert-subdir (cdr desktop-buffer-misc))
	      (current-buffer))
	  (message "Directory %s no longer exists." dir)
	  (sit-for 1)
	  'ignored))))

52457:6d5981c8551c

(defun desktop-buffer-dired () "Load a directory using dired."
  (if (eq 'dired-mode desktop-buffer-major-mode)
      ;; 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-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-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)
	  (sit-for 1)
	  'ignored))))