From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cDZXAhmn+F/FdQAA0tVLHw (envelope-from ) for ; Fri, 08 Jan 2021 18:40:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KJ3dORin+F/MNwAAbx9fmQ (envelope-from ) for ; Fri, 08 Jan 2021 18:40:24 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 76241940503 for ; Fri, 8 Jan 2021 18:40:24 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id D576829DCB; Fri, 8 Jan 2021 13:40:10 -0500 (EST) Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by mail.notmuchmail.org (Postfix) with ESMTPS id 4090329D85 for ; Fri, 8 Jan 2021 13:40:07 -0500 (EST) Received: by mail-wr1-x42f.google.com with SMTP id r3so9959011wrt.2 for ; Fri, 08 Jan 2021 10:40:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dme-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yjPC84UKUQSyTHmOBZkAJ07Db3gS4t62t2w2CIEiLPs=; b=wxypj0BqsndhN4HylAi16go0jWWIgXHXmjhVr8mmNgBUvfuuaCSMrYyk1UR7JdlcOv s6rmCNjU9WxhT4aNWkMEn2V5D8IfAGu0IaSdpYOFApREbuDPNPI2PWgfucd+GWQjGRsl emgds1F0DqqGf87Oh/6ATqn83zHQ9E/SQEECqrqrnLWNc/+el0H3UtBCfIqW39JJ5xtp 73gO+b/qn/lxzmKsmYXD5b9W4jrjqhDSkTKtxSjvGb8lWPOVWm1gf+MZczUHUS6A9ZZh B8aEnA7uRi93PYMKa1FvR8gK2E5v8DQBjU23YOTRsXJrpg3y5dMJVUeTcD9q8As3Bmx9 Gz0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yjPC84UKUQSyTHmOBZkAJ07Db3gS4t62t2w2CIEiLPs=; b=KYBrhUBcyE44llaeZ0zWvKfgUtd3Jgr8sxv7e5SR3Ev3IfxFP7lamfeQuuP3yKv36c grg1T8zs6GzlfCXdwY9gVrf0/sHK9eqXQgaQ7MT7ZvLjhR+kPqLuap2evmETrIlGlGod wSGRDFBJwnlWufvVYBrJ/CaVU8+F6gbzahIW6MHkpOXxqNBE4KwU5SITvypt1AxR18Zo VLk0Qk1Wx6I4yAe0bFAj4e7sGS68J4cH2Nhjh5OajkbUK04CbC9GtRW5zIq6NuwTkR4D pKRESukgpCCXeBQ4wlvL0dcsUSFuKo6qIgf1zI7nn82WKYbzeUelYRbuWhK8BikdTvFs Z/Bg== X-Gm-Message-State: AOAM533FPjAlIjTwHV2oOUSdapl2m5pD0niNH7zrwpkxsOeQlc2x9PrV xQGzpfpS5oE98wqY4wfbbh5PyupPL2dHQhsb X-Google-Smtp-Source: ABdhPJwbwaRaDrXV2SZdIs/o3oxugWnrwZ7i6P762OFlFlE+lzX0RAZY4mqG8kXOSSMvD228MEyOLQ== X-Received: by 2002:a5d:5181:: with SMTP id k1mr4825503wrv.226.1610131206126; Fri, 08 Jan 2021 10:40:06 -0800 (PST) Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net. [2001:8b0:bb71:7140:64::1]) by smtp.gmail.com with ESMTPSA id y68sm14497884wmc.0.2021.01.08.10.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jan 2021 10:40:05 -0800 (PST) Received: from localhost (disaster-area.hh.sledj.net [local]) by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id a261b922; Fri, 8 Jan 2021 18:40:04 +0000 (UTC) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH 1/2] emacs: with-current-notmuch-show-message should return the result of body Date: Fri, 8 Jan 2021 18:40:03 +0000 Message-Id: <20210108184004.781702-2-dme@dme.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210108184004.781702-1-dme@dme.org> References: <20210108184004.781702-1-dme@dme.org> MIME-Version: 1.0 Message-ID-Hash: RPUKVOEOCMCE4745L2WMLPAXV2FK6DWV X-Message-ID-Hash: RPUKVOEOCMCE4745L2WMLPAXV2FK6DWV X-MailFrom: dme@dme.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0 CC: David Edmondson X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.07 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=dme-org.20150623.gappssmtp.com header.s=20150623 header.b=wxypj0Bq; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 76241940503 X-Spam-Score: -0.07 X-Migadu-Scanner: scn0.migadu.com X-TUID: JusKcv3+UxyK Rather than returning the result of kill-buffer, with-current-notmuch-show-message should return the result of calling the passed body. --- emacs/notmuch-show.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index b08ceb97..222c9dae 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -272,11 +272,12 @@ position of the message in the thread." `(save-excursion (let ((id (notmuch-show-get-message-id))) (let ((buf (generate-new-buffer (concat "*notmuch-msg-" id "*")))) - (with-current-buffer buf - (let ((coding-system-for-read 'no-conversion)) - (call-process notmuch-command nil t nil "show" "--format=raw" id)) - ,@body) - (kill-buffer buf))))) + (prog1 + (with-current-buffer buf + (let ((coding-system-for-read 'no-conversion)) + (call-process notmuch-command nil t nil "show" "--format=raw" id)) + ,@body) + (kill-buffer buf)))))) (defun notmuch-show-turn-on-visual-line-mode () "Enable Visual Line mode." -- 2.29.2