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 15:18:47 +0200 Message-ID: <87zg0888g8.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> <87wmvc9y0e.fsf@ledu-giraud.fr> <831qdkmdxm.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="22264"; 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 15:24:21 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 1qvHOP-0005aA-8H for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 24 Oct 2023 15:24:21 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvHLj-0003RE-4n; Tue, 24 Oct 2023 09:21:35 -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 1qvHJm-0000VP-6F for bug-gnu-emacs@gnu.org; Tue, 24 Oct 2023 09:19:34 -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 1qvHJk-0002VA-5a for bug-gnu-emacs@gnu.org; Tue, 24 Oct 2023 09:19:33 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvHKD-0005Fd-NQ for bug-gnu-emacs@gnu.org; Tue, 24 Oct 2023 09:20:01 -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 13:20:01 +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.169815356220125 (code B ref 66697); Tue, 24 Oct 2023 13:20:01 +0000 Original-Received: (at 66697) by debbugs.gnu.org; 24 Oct 2023 13:19:22 +0000 Original-Received: from localhost ([127.0.0.1]:53455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvHJa-0005EW-9I for submit@debbugs.gnu.org; Tue, 24 Oct 2023 09:19:22 -0400 Original-Received: from ledu-giraud.fr ([51.159.28.247]:8316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvHJY-0005EO-3t for 66697@debbugs.gnu.org; Tue, 24 Oct 2023 09:19:21 -0400 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=EntCOxv/ lGUTdPdhKvN7RUTUt+H9S6Pn6tkj9ruEuQY=; h=date:references:in-reply-to: subject:cc:to:from; d=ledu-giraud.fr; b=4sdRxkt2fmOav4w4UKvLrYLzCVM98s HnX1hsKPO2ugMW8FbnpEdicfQmHUknrjlm94SqmXHkYTpNeP2EVeSSDA== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=EntCOxv/lGUTdPdh KvN7RUTUt+H9S6Pn6tkj9ruEuQY=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=hpSApbaLKar3huUFlJwKfqEJWXE0Ld02BzwetF 8U+n+v4Wvpuk8O1GDL2rXFllz0+Qyx5mCn39ob7v4ANcvSfQfWGX/gFpxJhf4pJVTbrunl akK0KQldcmIIvg086Re/Y420L3ujR1feC6uSFZLWGeCBLa56AAkoJ3EgNV8IQ1aCiqiGNq /tDFT4uIMpBB7oztbarYkvkRAZqhik/tWRnL8tv7yhQQGfMm8mONS+Ez6x4x/FOV+pYfs6 EOUogz3JY+s9PE2FMOvE51PVZ5XMV4shPkT0Pvi6CYPHZE1c8J8chWwdcbvpbbbdsvlniA iPya0TQej2hwOchuzQifNb5g== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id 73dae6b6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 24 Oct 2023 15:18:48 +0200 (CEST) In-Reply-To: <831qdkmdxm.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 24 Oct 2023 14:56:37 +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:273101 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: [...] > Sounds right, but don't you get byte-compiler warnings about > desktop-files-not-to-save not being known? I did not get a warning about desktop-files-not-to-save but I get one about shadowing dired-directory. So I fixed the patch with this new one. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-desktop-save-on-remote-dired-bug-66697.patch >From 6c32d99a9f1e8c813550c5a2540ef41ea2d59844 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Tue, 24 Oct 2023 14:51:04 +0200 Subject: [PATCH] Fix desktop-save on remote dired (bug#66697) 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. --- lisp/dired.el | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/lisp/dired.el b/lisp/dired.el index cc8c74839b9..4337480e2b5 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-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 -- 2.42.0 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=--