--- /dev/null
+Return-Path: <amthrax@drake.mit.edu>\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 113ED431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 7 Apr 2012 17:58:03 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[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 XII1fBCS07g4 for <notmuch@notmuchmail.org>;\r
+ Sat, 7 Apr 2012 17:58:02 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 64039431FD6\r
+ for <notmuch@notmuchmail.org>; Sat, 7 Apr 2012 17:58:00 -0700 (PDT)\r
+X-AuditID: 12074425-b7f4a6d0000008e0-68-4f80e2972140\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 81.05.02272.792E08F4; Sat, 7 Apr 2012 20:57:59 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q380vxnP005095; \r
+ Sat, 7 Apr 2012 20:57:59 -0400\r
+Received: from drake.mit.edu\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q380vwHV002165\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 7 Apr 2012 20:57:58 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1SGgS6-0001SP-1F; Sat, 07 Apr 2012 20:57:58 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/6] show: Remove support for old-style formatters in\r
+ show_message\r
+Date: Sat, 7 Apr 2012 20:57:46 -0400\r
+Message-Id: <1333846670-5356-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
+References: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrTv9UYO/wdvl1hbXb85kdmD0eLbq\r
+ FnMAYxSXTUpqTmZZapG+XQJXxvYfW1kKrvBXfN5ygr2BcR5PFyMnh4SAiUTL/tXMELaYxIV7\r
+ 69m6GLk4hAT2MUrsuXOaFcJZzyix+PwxdgjnHpPE2RvbmCCc+YwSS+5eAutnE9CQ2LZ/OSOI\r
+ LSIgLbHz7mygdg4OZgE1iT9dKiBhYYEgiW/rn7GA2CwCqhJL3yxlBynhFbCXuP/JBeIKBYln\r
+ 644zgdicAg4S21u3gk0XAipZuvg44wRG/gWMDKsYZVNyq3RzEzNzilOTdYuTE/PyUot0LfRy\r
+ M0v0UlNKNzGCgobdRXUH44RDSocYBTgYlXh4LXY3+AuxJpYVV+YeYpTkYFIS5X36ACjEl5Sf\r
+ UpmRWJwRX1Sak1p8iFGCg1lJhPf+YaAcb0piZVVqUT5MSpqDRUmcV1PrnZ+QQHpiSWp2ampB\r
+ ahFMVoaDQ0mC9/VDoEbBotT01Iq0zJwShDQTByfIcB6g4ZKPQIYXFyTmFmemQ+RPMSpKifO+\r
+ AGkWAElklObB9cKi+hWjONArwrzfQap4gAkBrvsV0GAmoME1r+pBBpckIqSkGhh1E+1bxI+G\r
+ 96feXOxe8Np80oEU3u0RtrzcRiW79bptfvJO/GT+SD5SK/Hsliy935yLVddvPzjt5rMUk1ID\r
+ K+8ebSv23z/e8iydx88ldXLG8r93XBl2npP/vSqjOVjf6c812dBXe/9rdjXKr3hyL8oq/5ir\r
+ 8GK3HXIzdJdd+OFwW1mqdYVXUoESS3FGoqEWc1FxIgAzq8zTxQIAAA==\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: Sun, 08 Apr 2012 00:58:03 -0000\r
+\r
+show_message used to have a compatibility path for old-style\r
+formatters. This removes that.\r
+---\r
+ notmuch-show.c | 52 +++++++++++++---------------------------------------\r
+ 1 files changed, 13 insertions(+), 39 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 0bf5e21..5a71115 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -815,46 +815,20 @@ show_message (void *ctx,\r
+ int indent,\r
+ notmuch_show_params_t *params)\r
+ {\r
+- if (format->part) {\r
+- void *local = talloc_new (ctx);\r
+- mime_node_t *root, *part;\r
+- notmuch_status_t status;\r
+-\r
+- status = mime_node_open (local, message, params->cryptoctx,\r
+- params->decrypt, &root);\r
+- if (status)\r
+- goto DONE;\r
+- part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));\r
+- if (part)\r
+- status = format->part (local, part, indent, params);\r
+- DONE:\r
+- talloc_free (local);\r
+- return status;\r
+- }\r
+-\r
+- if (params->part <= 0) {\r
+- fputs (format->message_start, stdout);\r
+- if (format->message)\r
+- format->message(ctx, message, indent);\r
+-\r
+- fputs (format->header_start, stdout);\r
+- if (format->header)\r
+- format->header(ctx, message);\r
+- fputs (format->header_end, stdout);\r
+-\r
+- fputs (format->body_start, stdout);\r
+- }\r
+-\r
+- if (format->part_content)\r
+- show_message_body (message, format, params);\r
+-\r
+- if (params->part <= 0) {\r
+- fputs (format->body_end, stdout);\r
+-\r
+- fputs (format->message_end, stdout);\r
+- }\r
++ void *local = talloc_new (ctx);\r
++ mime_node_t *root, *part;\r
++ notmuch_status_t status;\r
+ \r
+- return NOTMUCH_STATUS_SUCCESS;\r
++ status = mime_node_open (local, message, params->cryptoctx,\r
++ params->decrypt, &root);\r
++ if (status)\r
++ goto DONE;\r
++ part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));\r
++ if (part)\r
++ status = format->part (local, part, indent, params);\r
++ DONE:\r
++ talloc_free (local);\r
++ return status;\r
+ }\r
+ \r
+ static notmuch_status_t\r
+-- \r
+1.7.9.1\r
+\r