Patch to desktop.el

Patch to desktop.el

[Lars Hansen]

Please install the patch below.

Although I am working on some more minor changes to desktop.el (including documentation), I think this patch should installed now. It fixes a bug that might be quite annoying.

ChangeLog entry:

	* desktop.el (desktop-buffer-dired): Change name of local variable
	to be different from buffer local variable `dired-directory'.

Patch:

lh@lhcybercom:~/emacs/emacs-cvs$ diff -c desktop-1.61.el desktop.el
*** desktop-1.61.el	2003-08-18 23:29:36.000000000 +0200
--- desktop.el	2003-08-28 11:04:16.000000000 +0200
***************
*** 835,845 ****
        ;; 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)
--- 835,847 ----
        ;; 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)