Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 22:07:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix desktop-save on remote dired (bug#66697)

Browse source 
Do not gather "misc data" for dired buffer not meant to be
desktop saved.

lisp/dired.el (dired-desktop-save-p): New function to test if
`dired-directory' should be desktop saved.
(dired-desktop-buffer-misc-data): Use it.
This commit is contained in:
Manuel Giraud 2023-10-24 14:51:04 +02:00 committed by Eli Zaretskii
parent 5ee66620fd
commit ce4a62eece
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lisp/dired.el
View file

@ -4877,22 +4877,30 @@ Ask means pop up a menu for the user to select one of copy, move or link."
(eval-when-compile (require 'desktop))
(declare-function desktop-file-name "desktop" (filename dirname))
(defun dired-desktop-save-p ()
"Should `dired-directory' be desktop saved?"
(if (consp dired-directory)
(not (string-match-p desktop-files-not-to-save (car dired-directory)))
(not (string-match-p desktop-files-not-to-save dired-directory))))
(defun dired-desktop-buffer-misc-data (dirname)
"Auxiliary information to be saved in desktop file."
(cons
;; Value of `dired-directory'.
(if (consp dired-directory)
;; Directory name followed by list of files.
(cons (desktop-file-name (car dired-directory) dirname)
(cdr dired-directory))
;; Directory name, optionally with shell wildcard.
(desktop-file-name dired-directory dirname))
;; Subdirectories in `dired-subdir-alist'.
(cdr
(nreverse
(mapcar
(lambda (f) (desktop-file-name (car f) dirname))
dired-subdir-alist)))))
(when (and (stringp desktop-files-not-to-save)
(dired-desktop-save-p))
(cons
;; Value of `dired-directory'.
(if (consp dired-directory)
;; Directory name followed by list of files.
(cons (desktop-file-name (car dired-directory) dirname)
(cdr dired-directory))
;; Directory name, optionally with shell wildcard.
(desktop-file-name dired-directory dirname))
;; Subdirectories in `dired-subdir-alist'.
(cdr
(nreverse
(mapcar
(lambda (f) (desktop-file-name (car f) dirname))
dired-subdir-alist))))))
(defun dired-restore-desktop-buffer (_file-name
_buffer-name