From: Michael J Gruber <git@grubix.eu>
Date: Mon, 17 Jun 2024 19:28:24 +0000 (+0200)
Subject: Replace `without-restriction` with `save-restriction`
X-Git-Tag: archive/debian/0.39_rc0-1~35
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=b526c5ef0e1ae78380e68e5a24170542b884cbe3;p=notmuch

Replace `without-restriction` with `save-restriction`

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.
---

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))