Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.318 emacs/lisp/dired.el:1.319
*** emacs/lisp/dired.el:1.318 Mon Jul 18 10:24:58 2005
--- emacs/lisp/dired.el Mon Jul 18 15:18:33 2005
***************
*** 3262,3268 ****
;; Directory name followed by list of files.
(cons (desktop-file-name (car dired-directory) desktop-dirname)
(cdr dired-directory))
! ;; Directory name, optionally with with shell wildcard.
(desktop-file-name dired-directory desktop-dirname))
;; Subdirectories in `dired-subdir-alist'.
(cdr
--- 3262,3268 ----
;; Directory name followed by list of files.
(cons (desktop-file-name (car dired-directory) desktop-dirname)
(cdr dired-directory))
! ;; Directory name, optionally with shell wildcard.
(desktop-file-name dired-directory desktop-dirname))
;; Subdirectories in `dired-subdir-alist'.
(cdr
***************
*** 3277,3283 ****
desktop-buffer-misc)
"Restore a dired buffer specified in a desktop file."
;; 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)))
--- 3277,3283 ----
desktop-buffer-misc)
"Restore a dired buffer specified in a desktop file."
;; First element of `desktop-buffer-misc' is the value of `dired-directory'.
! ;; This value is a directory name, optionally 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)))
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
