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

diff --git a/c7/d97a71dd7d1753adcd5b76f694e5217f22897a b/c7/d97a71dd7d1753adcd5b76f694e5217f22897a
new file mode 100644 (file)
index 0000000..3464a73
--- /dev/null
+++ b/c7/d97a71dd7d1753adcd5b76f694e5217f22897a
@@ -0,0 +1,122 @@
+Return-Path: <dme@dme.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 0E946431FAF\r
+       for <notmuch@notmuchmail.org>; Wed,  8 Feb 2012 09:05:49 -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 uZxzYQZkK3Vd for <notmuch@notmuchmail.org>;\r
+       Wed,  8 Feb 2012 09:05:48 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 23F15431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  8 Feb 2012 09:05:48 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so601230wib.26\r
+       for <notmuch@notmuchmail.org>; Wed, 08 Feb 2012 09:05:47 -0800 (PST)\r
+Received: by 10.216.138.209 with SMTP id a59mr7172672wej.11.1328720747040;\r
+       Wed, 08 Feb 2012 09:05:47 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id l8sm4761454wiy.5.2012.02.08.09.05.44\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 08 Feb 2012 09:05:45 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id A483BA0A98; Wed,  8 Feb 2012 17:05:43 +0000 (GMT)\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] emacs: support defining a list of alternative parts\r
+       to show\r
+In-Reply-To:\r
+ <fe86d0e2cf0d236615613fa16d94c94fb2120729.1328719309.git.jani@nikula.org>\r
+References: <cover.1328719309.git.jani@nikula.org>\r
+       <fe86d0e2cf0d236615613fa16d94c94fb2120729.1328719309.git.jani@nikula.org>\r
+User-Agent: Notmuch/0.11.1+166~g546cb24 (http://notmuchmail.org)\r
+       Emacs/24.0.92.1 (x86_64-pc-linux-gnu)\r
+From: David Edmondson <dme@dme.org>\r
+Date: Wed, 08 Feb 2012 17:05:39 +0000\r
+Message-ID: <cunwr7x2r30.fsf@hotblack-desiato.hh.sledj.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+X-Gm-Message-State:\r
+ ALoCoQkQugmk8UYMynOLm/0fKKU7ktGA3yt2mgzYT1A1CwO/3uXr5kMiVn7ZJG9/1dtoyph4P1yr\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 17:05:49 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Wed,  8 Feb 2012 16:55:15 +0000, Jani Nikula <jani@nikula.org> wrote:\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
+>=20\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
+>=20\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
+It would be convenient if this was a list of regexps.\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=3D 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=\r
+ inner-type nil " (not shown)"))))\r
+> --=20\r
+> 1.7.1\r
+>=20\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iEYEARECAAYFAk8yq2MACgkQaezQq/BJZRajrQCeMK9QtMd4s5nKpcPleoKB/y6r\r
+nwUAn3A4etEY/XCwUiIC3bHknCPkSLLM\r
+=f2D7\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r