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

diff --git a/8a/4f4f59c3f68b07ae5e7196b0ef5e2c93b90bfe b/8a/4f4f59c3f68b07ae5e7196b0ef5e2c93b90bfe
new file mode 100644 (file)
index 0000000..1e5be45
--- /dev/null
+++ b/8a/4f4f59c3f68b07ae5e7196b0ef5e2c93b90bfe
@@ -0,0 +1,111 @@
+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 98542431FAF\r
+       for <notmuch@notmuchmail.org>; Thu,  9 Feb 2012 06:46:10 -0800 (PST)\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 JrZWDA8562uj for <notmuch@notmuchmail.org>;\r
+       Thu,  9 Feb 2012 06:46:10 -0800 (PST)\r
+Received: from mail-qw0-f53.google.com (mail-qw0-f53.google.com\r
+       [209.85.216.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E23D7431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  9 Feb 2012 06:46:09 -0800 (PST)\r
+Received: by qafk1 with SMTP id k1so1308748qaf.5\r
+       for <notmuch@notmuchmail.org>; Thu, 09 Feb 2012 06:46:08 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.229.136.200 with SMTP id s8mr1455121qct.9.1328798768080;\r
+       Thu, 09 Feb 2012 06:46:08 -0800 (PST)\r
+Received: from localhost (nikula.org. [92.243.24.172])\r
+       by mx.google.com with ESMTPS id dm7sm6160912qab.5.2012.02.09.06.46.05\r
+       (version=SSLv3 cipher=OTHER); Thu, 09 Feb 2012 06:46:06 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/2] emacs: support defining a list of alternative parts to\r
+       show\r
+Date: Thu,  9 Feb 2012 14:46:02 +0000\r
+Message-Id:\r
+ <ab777cf0fa83778d3399ac52094df9230738819d.1328798471.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
+X-Gm-Message-State:\r
+ ALoCoQk/v3rAlyab6jCzU03FNmqoOYXKf88jelYaFB/Rt1AZLGY9wi1YuiRJezlHbgYBJH4M2/cd\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, 09 Feb 2012 14:46:10 -0000\r
+\r
+Make notmuch-show-all-multipart/alternative-parts accept a list of\r
+regexps to match the part types to determine which parts to show in\r
+addition to the preferred types. This allows the user to force display\r
+some alternative part types while normally showing just the preferred\r
+ones.\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+---\r
+ emacs/notmuch-show.el |   23 ++++++++++++++++++-----\r
+ 1 files changed, 18 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 24fde05..5f643f1 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -94,10 +94,20 @@ any given message."\r
+   :group 'notmuch-show\r
+   :group 'notmuch-hooks)\r
+ \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
++  "Which parts of multipart/alternative should be shown?\r
++\r
++This variable determines which parts of multipart/alternative\r
++should be displayed. Set to t (the default) to show all\r
++parts. Set to nil to only show the preferred parts. Set to a list\r
++of regexps to display the preferred parts, and parts matching any\r
++of the regexps, for example:\r
++\r
++ (setq notmuch-show-all-multipart/alternative-parts\r
++      '(\"text/.*calendar\" \"text/html\"))"\r
++  :type '(choice (const :tag "Show all parts" t)\r
++               (const :tag "Show preferred parts" nil)\r
++               (repeat :tag "Show preferred and parts matching regexps" string))\r
+   :group 'notmuch-show)\r
+ \r
+ (defcustom notmuch-show-indent-messages-width 1\r
+@@ -513,8 +523,11 @@ 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
+-                    (string= chosen-type inner-type))\r
++            (if (or (equal notmuch-show-all-multipart/alternative-parts t)\r
++                    (string= chosen-type inner-type)\r
++                    (and\r
++                     notmuch-show-all-multipart/alternative-parts\r
++                     (equal (string-match-p (mapconcat (lambda (s) (format "^%s$" s)) notmuch-show-all-multipart/alternative-parts "\\|") inner-type) 0)))\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
+         inner-parts)\r
+-- \r
+1.7.1\r
+\r