[PATCH] emacs: Show all multipart/alternative parts by default.

diff --git a/d3/5787d5a75f2afc515b91ae66df6967511353b3 b/d3/5787d5a75f2afc515b91ae66df6967511353b3
new file mode 100644 (file)
index 0000000..eef81dc
--- /dev/null
+++ b/d3/5787d5a75f2afc515b91ae66df6967511353b3
@@ -0,0 +1,88 @@
+Return-Path: <jrollins@servo.finestructure.net>\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 289C5431FD0\r
+       for <notmuch@notmuchmail.org>; Wed, 22 Jun 2011 18:14:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.921\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5\r
+       tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]\r
+       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 RI7iddnPZMHp for <notmuch@notmuchmail.org>;\r
+       Wed, 22 Jun 2011 18:14:22 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id B2BC3431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 22 Jun 2011 18:14:22 -0700 (PDT)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by earth-doxen-postvirus (Postfix) with ESMTP id BBC3666E0211;\r
+       Wed, 22 Jun 2011 18:14:20 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from servo.finestructure.net (gwave-224.ligo.caltech.edu\r
+       [131.215.114.224]) (Authenticated sender: jrollins)\r
+       by earth-doxen-submit (Postfix) with ESMTP id 9349F66E013C;\r
+       Wed, 22 Jun 2011 18:14:13 -0700 (PDT)\r
+Received: by servo.finestructure.net (Postfix, from userid 1000)\r
+       id BF85326B; Wed, 22 Jun 2011 18:14:14 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH] emacs: Show all multipart/alternative parts by default.\r
+Date: Wed, 22 Jun 2011 18:14:12 -0700\r
+Message-Id: <1308791652-17372-2-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1308791652-17372-1-git-send-email-jrollins@finestructure.net>\r
+References: <1308791652-17372-1-git-send-email-jrollins@finestructure.net>\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: Thu, 23 Jun 2011 01:14:23 -0000\r
+\r
+This is patch is a temporary work-around for a slight regression that\r
+popped up in the part handling reorganization.  Currently, text/plain\r
+parts are always preferred, if present, over other non-text/plain\r
+parts in multipart/alternative.  However, this means that if there is\r
+a blank text/plain part, no content will be displayed.\r
+\r
+One way to get around this is to set the\r
+"notmuch-show-all-multipart/alternative-parts" customization variable\r
+to True ('t'), which will cause all parts to always be displayed.\r
+\r
+Since we want to move forward with the next release, we're going to\r
+set this variable true by default, to make sure that no content is\r
+unretrievably hidden from the user.  Once we come up with a better\r
+solution for easy display of hidden parts we can set this back to a\r
+default value of 'nil'.\r
+---\r
+ emacs/notmuch-show.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 0d9b52a..af1d44b 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -96,7 +96,7 @@ same as that of the previous message."\r
+            notmuch-wash-excerpt-citations))\r
+ \r
+ ;; Mostly useful for debugging.\r
+-(defcustom notmuch-show-all-multipart/alternative-parts nil\r
++(defcustom notmuch-show-all-multipart/alternative-parts t\r
+   "Should all parts of multipart/alternative parts be shown?"\r
+   :group 'notmuch\r
+   :type 'boolean)\r
+-- \r
+1.7.5.4\r
+\r