[PATCH 1/2] emacs: support defining a list of alternative parts to show

diff --git a/82/d1dd9900f9709444ea2fe82b735b9ce9f559ba b/82/d1dd9900f9709444ea2fe82b735b9ce9f559ba
new file mode 100644 (file)
index 0000000..e2f91fa
--- /dev/null
+++ b/82/d1dd9900f9709444ea2fe82b735b9ce9f559ba
@@ -0,0 +1,94 @@
+Return-Path: <jani@nikula.org>\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 8FD01429E26\r
+       for <notmuch@notmuchmail.org>; Wed,  8 Feb 2012 08:55:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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 Nc7yQ7PNgeOm for <notmuch@notmuchmail.org>;\r
+       Wed,  8 Feb 2012 08:55:24 -0800 (PST)\r
+Received: from mail-qw0-f46.google.com (mail-qw0-f46.google.com\r
+       [209.85.216.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 56C84431FAF\r
+       for <notmuch@notmuchmail.org>; Wed,  8 Feb 2012 08:55:24 -0800 (PST)\r
+Received: by qadc10 with SMTP id c10so4265234qad.5\r
+       for <notmuch@notmuchmail.org>; Wed, 08 Feb 2012 08:55:23 -0800 (PST)\r
+Received: by 10.224.195.133 with SMTP id ec5mr28068542qab.7.1328720123680;\r
+       Wed, 08 Feb 2012 08:55:23 -0800 (PST)\r
+Received: from localhost (nikula.org. [92.243.24.172])\r
+       by mx.google.com with ESMTPS id g9sm3869610qad.16.2012.02.08.08.55.21\r
+       (version=SSLv3 cipher=OTHER); Wed, 08 Feb 2012 08:55:22 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] emacs: support defining a list of alternative parts to\r
+       show\r
+Date: Wed,  8 Feb 2012 16:55:15 +0000\r
+Message-Id:\r
+ <fe86d0e2cf0d236615613fa16d94c94fb2120729.1328719309.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.1\r
+In-Reply-To: <cover.1328719309.git.jani@nikula.org>\r
+References: <cover.1328719309.git.jani@nikula.org>\r
+In-Reply-To: <cover.1328719309.git.jani@nikula.org>\r
+References: <cover.1328719309.git.jani@nikula.org>\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: Wed, 08 Feb 2012 16:55:28 -0000\r
+\r
+Make notmuch-show-all-multipart/alternative-parts accept a list of\r
+multipart/alternative types to show in addition to the preferred\r
+types. This allows the user to force display some alternative part\r
+types while normally showing just the preferred ones.\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+---\r
+ emacs/notmuch-show.el |    8 ++++++--\r
+ 1 files changed, 6 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index faa9f9b..1340380 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -97,7 +97,9 @@ any given message."\r
+ ;; Mostly useful for debugging.\r
+ (defcustom notmuch-show-all-multipart/alternative-parts t\r
+   "Should all parts of multipart/alternative parts be shown?"\r
+-  :type 'boolean\r
++  :type '(choice (const :tag "Show all" t)\r
++               (const :tag "Show preferred" nil)\r
++               (repeat :tag "Show preferred and custom" string))\r
+   :group 'notmuch-show)\r
+ \r
+ (defcustom notmuch-show-indent-messages-width 1\r
+@@ -513,7 +515,9 @@ current buffer, if possible."\r
+     ;; should be chosen if there are more than one that match?\r
+     (mapc (lambda (inner-part)\r
+           (let ((inner-type (plist-get inner-part :content-type)))\r
+-            (if (or notmuch-show-all-multipart/alternative-parts\r
++            (if (or (equal notmuch-show-all-multipart/alternative-parts t)\r
++                    (member inner-type\r
++                            notmuch-show-all-multipart/alternative-parts)\r
+                     (string= chosen-type inner-type))\r
+                 (notmuch-show-insert-bodypart msg inner-part depth)\r
+               (notmuch-show-insert-part-header (plist-get inner-part :id) inner-type inner-type nil " (not shown)"))))\r
+-- \r
+1.7.1\r
+\r