From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id UMz1C5dEcGYcHwEA62LTzQ:P1 (envelope-from ) for ; Mon, 17 Jun 2024 14:13:43 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id UMz1C5dEcGYcHwEA62LTzQ (envelope-from ) for ; Mon, 17 Jun 2024 16:13:43 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=IZo8dACk; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718633622; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=p+AbIAMennfRZ5r1EsYgx2y/W3FxXiuc5hWPjP5PxA8=; b=VGuOmSsi2cDTq6G2Lfsn135TKeus061vndj9oVG28RSetOrf/ltMQx8voIuivDTGynmY6c JM4Jh13/MUDvT80zDZ0KlFq/PoF7jav0rg8SKGv5SAXc6EuaiAGXkUyoQmGjElNJPtJuwD li/fU5FjLOfCoDen0DrC+yk/OOjCL/ne0nF1VeowX8y3/HEgb9IA6Rf6SmcZHxRY6SW9FY 5L/+hIiz9d21NYjVWqYFM6u8UYpbTJ7yNOvCjRehZwDLJ0bW06Vqo7v/1DdU2VpcMgDpgI Cn3qG9xn3z5SOIHWa9x/WUlDxqxkH2ZC2AN9cTBSkqv6GFsUllq48ll3ingHfg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=IZo8dACk; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718633622; a=rsa-sha256; cv=none; b=TJC/43Mcbu3ql2TrM5mFMOdvSnfvl35ZCKMOe8K9hG/9/RBAM9ovC78Kj1oN8f899mQl/c qVnjRIN1ZF2lcmBwRH6yzY7s57Uf7BTKg5BmwAokx7qJR4Luzwht+CLak3BmDDT1UhgX/j YJJUqjWoZRNSBFaLjxsqEW+rNv3ujBI4R8rv54s2QL5TX8i1Ejd/Q17G52zRMyUUC5fpXK 0/TF0AUzdSBboHP1mazEzggqHFGOWtb8HiLm+YL+D/LwhUGGdHam7nTnkEQZWUSwsn4qby clW3n8M6/gDY0e+WtRMR33o8AykcUEUwBDPw4Iw4ENVaN3haPPpXRJ+5Xa1nOQ== Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C40206F963 for ; Mon, 17 Jun 2024 16:13:42 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 71BF65F41E; Mon, 17 Jun 2024 14:04:07 +0000 (UTC) Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by mail.notmuchmail.org (Postfix) with ESMTPS id 9F0905E520 for ; Mon, 17 Jun 2024 14:04:04 +0000 (UTC) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-57cad452f8bso4914005a12.2 for ; Mon, 17 Jun 2024 07:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718633043; x=1719237843; darn=notmuchmail.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=KMeuQLQBHE8DfY2Ahz9OarnUAJusK3/rn05TzpH+TJM=; b=IZo8dACkNFV8hLCv43lTW3rGnsb4yxrHkUJpK8mhqezoC9eu1CIRkUW6Q7owFgvbcJ xIsGrCygr/0IJJHBc1KIuR9At8NSWTJghDV+SJngcao/zw5XwUC6Sz4R6dtJP4EtcRwV KUoRm8eL1qDLRacIBhKZPK3xoKG+b+eWi4EQInOIMoSPdKn/7aKz4Jl+G8Ek6jTkhi9t 6HLx5C2o+P6kQtZJOOT4yv7WUe7e/ESRAX+AdKt+9FRnIFNh1Rc9zvErtxnC/qJhGy0D RvJqe5lmZvhOHl2lrPcQO8qaS8wmZcQORdjF7IBoVWPmuMziGQ87wLOxZDPH83mQqQ7/ PKzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718633043; x=1719237843; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KMeuQLQBHE8DfY2Ahz9OarnUAJusK3/rn05TzpH+TJM=; b=XLoXkuQkv+yOzYJ0jTuz3fjxRZ99OyiS/qrGeTWVGcykK4Z4ZSCN2Rpj/phQbSqYZH bvImWy6NrGlnObeJRydXFBHDfdFy/4kby+odj7H1b7U6NKTBAhU6CGfhnMWrhYdIUKwd Ms2CYPMM+U0D6KbE0/JMoz/XB0ecQ2K7EfnPB6nrB/8PC0Sq0s0U7hnbA3TuVNyCez8u +R5Ls0PdwnJ0TYcBC0WUWJAW1vX0ycKFn0tqJ571jiiFi2zwkqLnE0Mcy2b2SHImXV3n 5WlUrcZxhWooe8Ysd9xTuqkniMb16JJ91uU+N8fLhq4B85nmXyga2/KqE9+mt+6WI7jb rypg== X-Gm-Message-State: AOJu0YyLxgz5HGyAc0UKGcJk07SfqWs5mGHuqkNrc43RZ8vGRx5Qr83V 59yF++G5v08hyQNwP7cPXFHPpabUzy9jTwGhBmmtTDPOM/vpXuA/bI6XyA== X-Google-Smtp-Source: AGHT+IGBXu32ZXO3XBiKioq/x45yiy4dyKwxe2AThzn141JN60dLI7tV6KBICbNyCwKMwrjEgkKjLw== X-Received: by 2002:a50:8747:0:b0:57c:563b:f37f with SMTP id 4fb4d7f45d1cf-57cbd67dbedmr6861142a12.19.1718633043155; Mon, 17 Jun 2024 07:04:03 -0700 (PDT) Received: from localhost (nb-ana002.math.uni-hannover.de. [130.75.46.4]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57cb7439070sm6508762a12.85.2024.06.17.07.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 07:04:02 -0700 (PDT) Sender: Michael J Gruber From: michaeljgruber+grubix+git@gmail.com To: notmuch@notmuchmail.org Subject: [PATCH] Replace `without-restriction` with `save-restriction` Date: Mon, 17 Jun 2024 16:04:01 +0200 Message-ID: X-Mailer: git-send-email 2.45.2.749.g54362de8d7 In-Reply-To: <87wmmn3imf.fsf@marcfargas.com> References: <87wmmn3imf.fsf@marcfargas.com> MIME-Version: 1.0 Message-ID-Hash: F4OEVKFKPJLHDWKJXAWHBSOCKYLSI5UG X-Message-ID-Hash: F4OEVKFKPJLHDWKJXAWHBSOCKYLSI5UG X-MailFrom: michaeljgruber+grubix+git@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael J Gruber X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Country: DE X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: C40206F963 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -2.47 X-Spam-Score: -2.47 X-TUID: n6AWHuQDma3u From: Michael J Gruber 37c022ae ("Use `without-restriction` in `with-temporary-notmuch-message-buffer`", 2024-03-14) introduced a fix for draft saving in a way which is supported on Emacs 29 and above only. Replace this with a construct which we have used before, so that we keep the same compatibility level. --- So, this fixes one incompatibility, and as per the emacs docs, those should be equivalent. Alas: T630-emacs-draft introduced another incompatibility by using `delete-line`, it seems. I haven't checked versions nor substitutes yet. emacs/notmuch-maildir-fcc.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el index cf50e855..c7b403cf 100644 --- a/emacs/notmuch-maildir-fcc.el +++ b/emacs/notmuch-maildir-fcc.el @@ -145,7 +145,8 @@ Otherwise set it according to `notmuch-fcc-dirs'." (defmacro with-temporary-notmuch-message-buffer (&rest body) "Set-up a temporary copy of the current message-mode buffer." - `(without-restriction + `(save-restriction + (widen) (let ((case-fold-search t) (buf (current-buffer)) (mml-externalize-attachments message-fcc-externalize-attachments)) -- 2.45.2.749.g54362de8d7