6d/14ae7121fb34c7b11221cb01ba7feddd172a05

   1 Return-Path: <dme@dme.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id A71A3429E36\r
   6         for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:48 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id q2Csq3n3wjKS for <notmuch@notmuchmail.org>;\r
  16         Mon, 12 May 2014 05:29:44 -0700 (PDT)\r
  17 Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com\r
  18         [209.85.212.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id E94F1431FD4\r
  21         for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:34 -0700 (PDT)\r
  22 Received: by mail-wi0-f174.google.com with SMTP id r20so4372363wiv.1\r
  23         for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:33 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
  27         :references;\r
  28         bh=i/oy1NL3S4OBUcjsYU7MHSgL5CrHolFDI46roRFEmWQ=;\r
  29         b=iuXzK56ekQf1CDw3tEAv27JRVYzLt2fQFuta81a43SSitEvW8SJQAh9deSFIqMvlds\r
  30         d6Xu1Ya4pUJIOoi/1Bhi+kobAJpGxV6SFc+ELJOIJLv8hhrFIkOP8Oin9DXDNeLysUCG\r
  31         JpUb14kTvsay+c/lUY3fh9qdfURWrETGYXdSLEpKioTX0rgahUJK9TWZI2TSwPSOLZRs\r
  32         8SEUlZqjhHlgb8QpuiX8CSaypTeOdd/O0NGKy3lG/7JBW/Vtyt+BZ2PibIl6MfwHw8zR\r
  33         qp+AfcW6Q1YzTL3Vmw02SJO3Y5mWZcE8Sdvv3hrka2VSKirNpBEYNSWZl/qHmIJH1hLh\r
  34         JvVA==\r
  35 X-Gm-Message-State:\r
  36  ALoCoQmhgmfs9rJ2IqJF+h+9q824IMBC2ktdzKLtv9rh8IpYdtJpSUHx/xVu5DhjEYuwWhh2Spwj\r
  37 X-Received: by 10.194.62.40 with SMTP id v8mr339755wjr.91.1399897773784;\r
  38         Mon, 12 May 2014 05:29:33 -0700 (PDT)\r
  39 Received: from hotblack-desiato.hh.sledj.net (disaster-area.hh.sledj.net.\r
  40         [81.149.164.25])\r
  41         by mx.google.com with ESMTPSA id k2sm9993751wjq.20.2014.05.12.05.29.32\r
  42         for <notmuch@notmuchmail.org>\r
  43         (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  44         Mon, 12 May 2014 05:29:32 -0700 (PDT)\r
  45 Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
  46         id 44D3B10B32C; Mon, 12 May 2014 13:29:29 +0100 (BST)\r
  47 From: David Edmondson <dme@dme.org>\r
  48 To: notmuch@notmuchmail.org\r
  49 Subject: [PATCH v3 6/9] emacs/mua: Don't insert part headers in citations\r
  50 Date: Mon, 12 May 2014 13:29:26 +0100\r
  51 Message-Id: <1399897769-26809-7-git-send-email-dme@dme.org>\r
  52 X-Mailer: git-send-email 2.0.0.rc0\r
  53 In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org>\r
  54 References: <87sixdujkv.fsf@qmul.ac.uk>\r
  55         <1399897769-26809-1-git-send-email-dme@dme.org>\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Mon, 12 May 2014 12:29:48 -0000\r
  69 \r
  70 Avoid inserting part headers when rendering a message body for\r
  71 citation purposes.\r
  72 ---\r
  73  emacs/notmuch-mua.el | 11 +++++++----\r
  74  1 file changed, 7 insertions(+), 4 deletions(-)\r
  75 \r
  76 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
  77 index 09c922f..c800c38 100644\r
  78 --- a/emacs/notmuch-mua.el\r
  79 +++ b/emacs/notmuch-mua.el\r
  80 @@ -201,10 +201,13 @@ list."\r
  81         (insert "Date: " date "\n\n")\r
  82  \r
  83         (insert (with-temp-buffer\r
  84 -                 ;; Don't attempt to clean up messages, excerpt\r
  85 -                 ;; citations, etc. in the original message before\r
  86 -                 ;; quoting.\r
  87 -                 (let ((notmuch-show-insert-text/plain-hook nil))\r
  88 +                 (let\r
  89 +                     ;; Don't attempt to clean up messages, excerpt\r
  90 +                     ;; citations, etc. in the original message before\r
  91 +                     ;; quoting.\r
  92 +                     ((notmuch-show-insert-text/plain-hook nil)\r
  93 +                      ;; Don't insert part buttons.\r
  94 +                      (notmuch-show-insert-header-p-function #'notmuch-show-insert-header-p-never))\r
  95                     (notmuch-show-insert-body original (plist-get original :body) 0)\r
  96                     (buffer-substring-no-properties (point-min) (point-max)))))\r
  97  \r
  98 -- \r
  99 2.0.0.rc0\r
 100 \r