[PATCH v3 1/5] emacs: show: fake wash parts are handled at insert-bodypart level

diff --git a/b2/50a4dee1e222811d6f164004121b84055c6511 b/b2/50a4dee1e222811d6f164004121b84055c6511
new file mode 100644 (file)
index 0000000..b4b2163
--- /dev/null
+++ b/b2/50a4dee1e222811d6f164004121b84055c6511
@@ -0,0 +1,90 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9C141431FC3\r
+       for <notmuch@notmuchmail.org>; Fri, 31 May 2013 11:27:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id eINWr+2SMYjo for <notmuch@notmuchmail.org>;\r
+       Fri, 31 May 2013 11:27:18 -0700 (PDT)\r
+Received: from mail-we0-f173.google.com (mail-we0-f173.google.com\r
+       [74.125.82.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E29E8431E62\r
+       for <notmuch@notmuchmail.org>; Fri, 31 May 2013 11:27:15 -0700 (PDT)\r
+Received: by mail-we0-f173.google.com with SMTP id x55so10583wes.18\r
+       for <notmuch@notmuchmail.org>; Fri, 31 May 2013 11:27:14 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=XTLQIG0MOjaajCAaqIqK4gOZq3kwruQokiCoFdr5H7k=;\r
+       b=fugkY3QCi1ZjaD4zsE45BfBli+/uu14dWbIJxzDFEj/m+2U0PySlJgLgqaQratpw+v\r
+       3ELSwoybLHhC/ENlLrOvKchHpUlkMHyTnS2g9ulZFbeeny65FthWH7xjGxIWEDQdxxam\r
+       mFHalSP0UBrN3AvzbbqxwLq/MW00x7f0GKBnfwdVrTysWnrfWydxJzmSX82a8FZWfv7l\r
+       xNuI/oDPD/uakLPyATCuV+3Mk/o7Hw9HA+vPJ/j/U1+aoMmFcFXtFShPW/QP4melbXSY\r
+       kPKh4lSO87Xg3WdwGFAZZnnOKd9smHq3rf/BHFemp29fxvKCqa7eL6VnhSH13bIkfikg\r
+       /uFg==\r
+X-Received: by 10.181.11.194 with SMTP id ek2mr4510257wid.27.1370024834747;\r
+       Fri, 31 May 2013 11:27:14 -0700 (PDT)\r
+Received: from localhost (92.40.240.237.threembb.co.uk. [92.40.240.237])\r
+       by mx.google.com with ESMTPSA id fu14sm5755056wic.0.2013.05.31.11.27.13\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 31 May 2013 11:27:14 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org, Austin Clements <aclements@csail.mit.edu>,\r
+       Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+Subject: [PATCH v3 1/5] emacs: show: fake wash parts are handled at\r
+       insert-bodypart level\r
+Date: Fri, 31 May 2013 19:26:42 +0100\r
+Message-Id: <1370024806-6616-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1370024806-6616-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1370024806-6616-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 31 May 2013 18:27:25 -0000\r
+\r
+Earlier patches have moved the handling of wash fake inline patch\r
+parts to insert-bodypart so we can drop the function\r
+notmuch-show-insert-part-inline-patch-fake-part\r
+---\r
+ emacs/notmuch-show.el |    4 ----\r
+ 1 file changed, 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index b0a8d8a..fd14469 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -809,10 +809,6 @@ message at DEPTH in the current thread."\r
+               nil))\r
+         nil))))\r
+ \r
+-;; Handler for wash generated inline patch fake parts.\r
+-(defun notmuch-show-insert-part-inline-patch-fake-part (msg part content-type nth depth declared-type)\r
+-  (notmuch-show-insert-part-*/* msg part content-type nth depth declared-type))\r
+-\r
+ (defun notmuch-show-insert-part-text/html (msg part content-type nth depth declared-type)\r
+   ;; text/html handler to work around bugs in renderers and our\r
+   ;; invisibile parts code. In particular w3m sets up a keymap which\r
+-- \r
+1.7.10.4\r
+\r