[Emacs-diffs] Changes to emacs/lisp/desktop.el

[Lars Hansen]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.63 emacs/lisp/desktop.el:1.64
*** emacs/lisp/desktop.el:1.63  Mon Sep  1 11:45:09 2003
--- emacs/lisp/desktop.el       Mon Sep  8 03:02:44 2003
***************
*** 834,844 ****
        ;; 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)
--- 834,846 ----
        ;; 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)