Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id A71A3429E36 for ; Mon, 12 May 2014 05:29:48 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q2Csq3n3wjKS for ; Mon, 12 May 2014 05:29:44 -0700 (PDT) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id E94F1431FD4 for ; Mon, 12 May 2014 05:29:34 -0700 (PDT) Received: by mail-wi0-f174.google.com with SMTP id r20so4372363wiv.1 for ; Mon, 12 May 2014 05:29:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=i/oy1NL3S4OBUcjsYU7MHSgL5CrHolFDI46roRFEmWQ=; b=iuXzK56ekQf1CDw3tEAv27JRVYzLt2fQFuta81a43SSitEvW8SJQAh9deSFIqMvlds d6Xu1Ya4pUJIOoi/1Bhi+kobAJpGxV6SFc+ELJOIJLv8hhrFIkOP8Oin9DXDNeLysUCG JpUb14kTvsay+c/lUY3fh9qdfURWrETGYXdSLEpKioTX0rgahUJK9TWZI2TSwPSOLZRs 8SEUlZqjhHlgb8QpuiX8CSaypTeOdd/O0NGKy3lG/7JBW/Vtyt+BZ2PibIl6MfwHw8zR qp+AfcW6Q1YzTL3Vmw02SJO3Y5mWZcE8Sdvv3hrka2VSKirNpBEYNSWZl/qHmIJH1hLh JvVA== X-Gm-Message-State: ALoCoQmhgmfs9rJ2IqJF+h+9q824IMBC2ktdzKLtv9rh8IpYdtJpSUHx/xVu5DhjEYuwWhh2Spwj X-Received: by 10.194.62.40 with SMTP id v8mr339755wjr.91.1399897773784; Mon, 12 May 2014 05:29:33 -0700 (PDT) Received: from hotblack-desiato.hh.sledj.net (disaster-area.hh.sledj.net. [81.149.164.25]) by mx.google.com with ESMTPSA id k2sm9993751wjq.20.2014.05.12.05.29.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 May 2014 05:29:32 -0700 (PDT) Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) id 44D3B10B32C; Mon, 12 May 2014 13:29:29 +0100 (BST) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH v3 6/9] emacs/mua: Don't insert part headers in citations Date: Mon, 12 May 2014 13:29:26 +0100 Message-Id: <1399897769-26809-7-git-send-email-dme@dme.org> X-Mailer: git-send-email 2.0.0.rc0 In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org> References: <87sixdujkv.fsf@qmul.ac.uk> <1399897769-26809-1-git-send-email-dme@dme.org> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 12:29:48 -0000 Avoid inserting part headers when rendering a message body for citation purposes. --- emacs/notmuch-mua.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 09c922f..c800c38 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -201,10 +201,13 @@ list." (insert "Date: " date "\n\n") (insert (with-temp-buffer - ;; Don't attempt to clean up messages, excerpt - ;; citations, etc. in the original message before - ;; quoting. - (let ((notmuch-show-insert-text/plain-hook nil)) + (let + ;; Don't attempt to clean up messages, excerpt + ;; citations, etc. in the original message before + ;; quoting. + ((notmuch-show-insert-text/plain-hook nil) + ;; Don't insert part buttons. + (notmuch-show-insert-header-p-function #'notmuch-show-insert-header-p-never)) (notmuch-show-insert-body original (plist-get original :body) 0) (buffer-substring-no-properties (point-min) (point-max))))) -- 2.0.0.rc0