From 1ccf02724c60aef4d54cb22ebeffe0d18eddf0ce Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 9 Feb 2012 14:46:02 +0000 Subject: [PATCH] [PATCH v2 1/2] emacs: support defining a list of alternative parts to show --- 8a/4f4f59c3f68b07ae5e7196b0ef5e2c93b90bfe | 111 ++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 8a/4f4f59c3f68b07ae5e7196b0ef5e2c93b90bfe diff --git a/8a/4f4f59c3f68b07ae5e7196b0ef5e2c93b90bfe b/8a/4f4f59c3f68b07ae5e7196b0ef5e2c93b90bfe new file mode 100644 index 000000000..1e5be45d6 --- /dev/null +++ b/8a/4f4f59c3f68b07ae5e7196b0ef5e2c93b90bfe @@ -0,0 +1,111 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 98542431FAF + for ; Thu, 9 Feb 2012 06:46:10 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id JrZWDA8562uj for ; + Thu, 9 Feb 2012 06:46:10 -0800 (PST) +Received: from mail-qw0-f53.google.com (mail-qw0-f53.google.com + [209.85.216.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id E23D7431FAE + for ; Thu, 9 Feb 2012 06:46:09 -0800 (PST) +Received: by qafk1 with SMTP id k1so1308748qaf.5 + for ; Thu, 09 Feb 2012 06:46:08 -0800 (PST) +MIME-Version: 1.0 +Received: by 10.229.136.200 with SMTP id s8mr1455121qct.9.1328798768080; + Thu, 09 Feb 2012 06:46:08 -0800 (PST) +Received: from localhost (nikula.org. [92.243.24.172]) + by mx.google.com with ESMTPS id dm7sm6160912qab.5.2012.02.09.06.46.05 + (version=SSLv3 cipher=OTHER); Thu, 09 Feb 2012 06:46:06 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v2 1/2] emacs: support defining a list of alternative parts to + show +Date: Thu, 9 Feb 2012 14:46:02 +0000 +Message-Id: + +X-Mailer: git-send-email 1.7.1 +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQk/v3rAlyab6jCzU03FNmqoOYXKf88jelYaFB/Rt1AZLGY9wi1YuiRJezlHbgYBJH4M2/cd +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 09 Feb 2012 14:46:10 -0000 + +Make notmuch-show-all-multipart/alternative-parts accept a list of +regexps to match the part types to determine which parts to show in +addition to the preferred types. This allows the user to force display +some alternative part types while normally showing just the preferred +ones. + +Signed-off-by: Jani Nikula +--- + emacs/notmuch-show.el | 23 ++++++++++++++++++----- + 1 files changed, 18 insertions(+), 5 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 24fde05..5f643f1 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -94,10 +94,20 @@ any given message." + :group 'notmuch-show + :group 'notmuch-hooks) + +-;; Mostly useful for debugging. + (defcustom notmuch-show-all-multipart/alternative-parts t +- "Should all parts of multipart/alternative parts be shown?" +- :type 'boolean ++ "Which parts of multipart/alternative should be shown? ++ ++This variable determines which parts of multipart/alternative ++should be displayed. Set to t (the default) to show all ++parts. Set to nil to only show the preferred parts. Set to a list ++of regexps to display the preferred parts, and parts matching any ++of the regexps, for example: ++ ++ (setq notmuch-show-all-multipart/alternative-parts ++ '(\"text/.*calendar\" \"text/html\"))" ++ :type '(choice (const :tag "Show all parts" t) ++ (const :tag "Show preferred parts" nil) ++ (repeat :tag "Show preferred and parts matching regexps" string)) + :group 'notmuch-show) + + (defcustom notmuch-show-indent-messages-width 1 +@@ -513,8 +523,11 @@ current buffer, if possible." + ;; should be chosen if there are more than one that match? + (mapc (lambda (inner-part) + (let ((inner-type (plist-get inner-part :content-type))) +- (if (or notmuch-show-all-multipart/alternative-parts +- (string= chosen-type inner-type)) ++ (if (or (equal notmuch-show-all-multipart/alternative-parts t) ++ (string= chosen-type inner-type) ++ (and ++ notmuch-show-all-multipart/alternative-parts ++ (equal (string-match-p (mapconcat (lambda (s) (format "^%s$" s)) notmuch-show-all-multipart/alternative-parts "\\|") inner-type) 0))) + (notmuch-show-insert-bodypart msg inner-part depth) + (notmuch-show-insert-part-header (plist-get inner-part :id) inner-type inner-type nil " (not shown)")))) + inner-parts) +-- +1.7.1 + -- 2.26.2