From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Giraud via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#66697: 30.0.50; [PATCH] desktop-save-mode with expiring remote buffers Date: Tue, 24 Oct 2023 11:21:21 +0200 Message-ID: <87wmvc9y0e.fsf@ledu-giraud.fr> References: <875y2xelsk.fsf@ledu-giraud.fr> <83o7gpo9bm.fsf@gnu.org> <87pm15h605.fsf@ledu-giraud.fr> <83jzrdo68n.fsf@gnu.org> <87lebth4zi.fsf@ledu-giraud.fr> <83a5s9o1wa.fsf@gnu.org> Reply-To: Manuel Giraud Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32427"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 66697@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Oct 24 11:21:57 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qvDbo-0008Au-I4 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 24 Oct 2023 11:21:56 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvDbS-0001BV-6g; Tue, 24 Oct 2023 05:21:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvDbQ-0001BK-SI for bug-gnu-emacs@gnu.org; Tue, 24 Oct 2023 05:21:32 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvDbQ-0004eQ-J6 for bug-gnu-emacs@gnu.org; Tue, 24 Oct 2023 05:21:32 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvDbu-0001jb-1U for bug-gnu-emacs@gnu.org; Tue, 24 Oct 2023 05:22:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 24 Oct 2023 09:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66697 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 66697-submit@debbugs.gnu.org id=B66697.16981393186654 (code B ref 66697); Tue, 24 Oct 2023 09:22:02 +0000 Original-Received: (at 66697) by debbugs.gnu.org; 24 Oct 2023 09:21:58 +0000 Original-Received: from localhost ([127.0.0.1]:53141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvDbq-0001jF-3V for submit@debbugs.gnu.org; Tue, 24 Oct 2023 05:21:58 -0400 Original-Received: from ledu-giraud.fr ([51.159.28.247]:4455) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvDbl-0001j5-73 for 66697@debbugs.gnu.org; Tue, 24 Oct 2023 05:21:55 -0400 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=iozka8+K QIvfRKERk0EwVyXKWRWrerUOISo3r+6OPIg=; h=date:references:in-reply-to: subject:cc:to:from; d=ledu-giraud.fr; b=KJyqz44oE/bo4ZfA1XkpygcE+LKQ84 w3SryIViM1Kj+pcyzZ21xQXtS3MkvZzHRV4Bpq/drV7XsLJk6g1uCYAA== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=iozka8+KQIvfRKER k0EwVyXKWRWrerUOISo3r+6OPIg=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=TbZ/SPJqas7JvnNrBGu0DoN8Li82VjJcSeCkSH zjL9DenAOuKFPV6mHEqd/+dObPu/0ZAC5qt8S4IIXcDI1lfTgDTYAjgXsE7Gy2nKCvES8g HOfXt4I/miJRgL8bN033EIfY9GyEn5aFh9P3FhBAXsBoFYQX7Wu0LevZFDKpN8i7BwJypI Rm/SKwVoQL5pPz+62MASkXDcTJsJKPM3NQpDeYSdi4vpGeJXbihiX6oLtecCllIxRSdLAq xgz/POF85nH/8+tAe9GHkj/2cOnVsk0stM/VlHLG9kI286aTzAQH6in1kNciRPaleHXtda bZgFjlpmMTGWzCC1gmxGbR6g== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id 430da498 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 24 Oct 2023 11:21:21 +0200 (CEST) In-Reply-To: <83a5s9o1wa.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 23 Oct 2023 17:21:25 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:273090 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: [...] > Doesn't this tell that the problem is in dired.el, not in desktop.el? > The problematic call comes from dired-desktop-buffer-misc-data, not > from desktop.el. So it's dired-desktop-buffer-misc-data that needs to > be fixed. So I work a bit on 'dired-desktop-buffer-misc-data' and have the following solution: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=dired.diff diff --git a/lisp/dired.el b/lisp/dired.el index cc8c74839b9..cae9f31010a 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -4875,22 +4875,30 @@ dired-dnd-handle-file (eval-when-compile (require 'desktop)) (declare-function desktop-file-name "desktop" (filename dirname)) +(defun dired-desktop-buffer-save-p (dired-directory) + "Should this DIRED-DIRECTORY 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-buffer-save-p dired-directory)) + (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 --=-=-= Content-Type: text/plain WDYT? -- Manuel Giraud --=-=-=--