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: Sat, 09 Dec 2023 13:05:24 +0100 Message-ID: <877clneg3f.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> <87zg0888g8.fsf@ledu-giraud.fr> <87cywusded.fsf@ledu-giraud.fr> <83fs1q9moq.fsf@gnu.org> <87wmv1g4g0.fsf@ledu-giraud.fr> <83a5rxacum.fsf@gnu.org> <87fs0csri9.fsf@ledu-giraud.fr> <83edfvy9ka.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="22585"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: andrewjmoreton@gmail.com, 66697@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 09 13:06:16 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 1rBw64-0005gG-L5 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 09 Dec 2023 13:06:16 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBw5g-00027L-Pz; Sat, 09 Dec 2023 07:05:52 -0500 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 1rBw5e-000271-0T for bug-gnu-emacs@gnu.org; Sat, 09 Dec 2023 07:05:50 -0500 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 1rBw5d-0000if-BQ for bug-gnu-emacs@gnu.org; Sat, 09 Dec 2023 07:05:49 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBw5q-00035m-Bq for bug-gnu-emacs@gnu.org; Sat, 09 Dec 2023 07:06:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 09 Dec 2023 12:06: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.170212354611863 (code B ref 66697); Sat, 09 Dec 2023 12:06:02 +0000 Original-Received: (at 66697) by debbugs.gnu.org; 9 Dec 2023 12:05:46 +0000 Original-Received: from localhost ([127.0.0.1]:46932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBw5a-00035H-6l for submit@debbugs.gnu.org; Sat, 09 Dec 2023 07:05:46 -0500 Original-Received: from ledu-giraud.fr ([51.159.28.247]:37238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBw5W-000357-UT for 66697@debbugs.gnu.org; Sat, 09 Dec 2023 07:05:44 -0500 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=2Cyt4yK6 KwH+E4uUJDeX/wEPbRM106GNqrZjaswThLM=; h=date:references:in-reply-to: subject:cc:to:from; d=ledu-giraud.fr; b=QrRC5CyKyGICVFqwExiEaAFz9YrT5V e4TaCk30tr+gQzktbS8XJrsQ9EaisLZeGdIflC1GnznKHlEGZhvplZBQ== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=2Cyt4yK6KwH+E4uU JDeX/wEPbRM106GNqrZjaswThLM=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=AV5E4qL0K985d08uxRlSjkFpsb1lxD3pIWa5Vg QKQwKANDCF3KXWxY9NJ1MRkmYcAuDw06I/o0dotcULxWyvOaC6rHLfp9rTxZHItlOje1TY PiPP3RPAGnecG8Pncuz3OKfsxNL3j2de6xntpD97zVtkvpPz2Wr2A6lhzVlkJq+9EtAyeT 5uQpQhE6I+Jn6MDYU7njya0B8XvibdcxljOlGRcfDmaQ6cc6wdYajvtMwT1enliRVlZh0a CH2WLjKmBJkXY1HUGpPElHsLrwsotZO3g6rR6gCCOofGvqRRuhPidBzE5/U8iO+PD24A9M 3JadH8GMe5FQR8eO9M6/PhsQ== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id 91035507 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 9 Dec 2023 13:05:27 +0100 (CET) In-Reply-To: <83edfvy9ka.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 09 Dec 2023 12:06:13 +0200") 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:275846 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: [...] > Thanks, but I wonder whether a better way would be to modify > dired-desktop-save-p such that it handled correctly non-string values > of desktop-files-not-to-save? That would make the handling of this > variable more local, which is better for maintenance, I think. > > WDYT? Sure. Good idea. Here is a new version. -- Manuel Giraud --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-desktop-save-for-dired-buffers-bug-66697.patch >From b421faf27c38d7ce8d3c4f39df68f21d2eccc735 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Sat, 9 Dec 2023 13:02:19 +0100 Subject: [PATCH] Fix desktop-save for dired buffers (bug#66697) * lisp/dired.el (dired-desktop-save-p): Move all logic here. Carry on when 'desktop-files-not-to-save' is nil. (dired-desktop-buffer-misc-data): Use it. --- lisp/dired.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/dired.el b/lisp/dired.el index 7f4b96353ee..36ca54efc37 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -4989,14 +4989,15 @@ dired-dnd-handle-file (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)))) + (or (null desktop-files-not-to-save) + (and (stringp desktop-files-not-to-save) + (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." - (when (and (stringp desktop-files-not-to-save) - (dired-desktop-save-p)) + (when (dired-desktop-save-p) (cons ;; Value of `dired-directory'. (if (consp dired-directory) -- 2.43.0 --=-=-=--