From: Jani Nikula Date: Fri, 10 Feb 2012 10:17:52 +0000 (+0000) Subject: Re: [PATCH v2 1/2] emacs: support defining a list of alternative parts to show X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d6aa9c0a51938bad20fdff7175f2eafa6beb018b;p=notmuch-archives.git Re: [PATCH v2 1/2] emacs: support defining a list of alternative parts to show --- diff --git a/d1/ea751fb44dd77c288f517aa9a508b1e2482bd5 b/d1/ea751fb44dd77c288f517aa9a508b1e2482bd5 new file mode 100644 index 000000000..4014ed3bb --- /dev/null +++ b/d1/ea751fb44dd77c288f517aa9a508b1e2482bd5 @@ -0,0 +1,153 @@ +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 BED4E431FB6 + for ; Fri, 10 Feb 2012 02:18:03 -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 iC61gopl7lDM for ; + Fri, 10 Feb 2012 02:17:57 -0800 (PST) +Received: from mail-qy0-f181.google.com (mail-qy0-f181.google.com + [209.85.216.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 10B6B431FAE + for ; Fri, 10 Feb 2012 02:17:57 -0800 (PST) +Received: by qcsd17 with SMTP id d17so1764344qcs.26 + for ; Fri, 10 Feb 2012 02:17:55 -0800 (PST) +Received: by 10.229.106.221 with SMTP id y29mr3866826qco.88.1328869075300; + Fri, 10 Feb 2012 02:17:55 -0800 (PST) +Received: from localhost (nikula.org. [92.243.24.172]) + by mx.google.com with ESMTPS id j17sm11969800qaj.9.2012.02.10.02.17.53 + (version=SSLv3 cipher=OTHER); Fri, 10 Feb 2012 02:17:54 -0800 (PST) +From: Jani Nikula +To: David Edmondson , notmuch@notmuchmail.org +Subject: Re: [PATCH v2 1/2] emacs: support defining a list of alternative + parts to show +In-Reply-To: +References: + + +User-Agent: Notmuch/0.11.1+168~g25a7ceb (http://notmuchmail.org) Emacs/23.1.1 + (i686-pc-linux-gnu) +Date: Fri, 10 Feb 2012 10:17:52 +0000 +Message-ID: <87ipjff0vj.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQlyn+/0q2IQeatL5U14IgtAMiWagB+XL0SGaZ3OyjMJbp7UMYd6uxZY0iArv/lhPEkiKtFG +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: Fri, 10 Feb 2012 10:18:03 -0000 + +On Fri, 10 Feb 2012 10:05:46 +0000, David Edmondson wrote: +> On Thu, 9 Feb 2012 14:46:02 +0000, Jani Nikula wrote: +> > 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: +> +> "If set to `t' (the default), all sub-parts of a +> \"multipart/alternative\" part are shown. If set to `nil', only the +> preferred part is shown. If set to a list of regexps, the preferred part +> and all parts whose type matches one of the regexps will be shown." + +Thank you; this is the best kind of comment on improving documentation. + +> +> > + +> > + (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))) +> +> This is quite messy. How about we add a general helper to "notmuch-lib.el": +> +> (defun notmuch-string-match-list-p (regexps string) +> (loop for regexp in regexps +> if (string-match-p regexp string) +> return t)) +> +> and then write: +> +> (if (or (string= chosen-type inner-type) +> (equal notmuch-show-all-multipart/alternative-parts t) +> (notmuch-string-match-list-p notmuch-show-all-multipart/alternative-parts inner-type)) +> ... +> +> ? + +*sigh* I was so happy to make that mapconcat work. And I guess soon I'll +have to add "code by dme" in this patch too. ;) + +But you're right, it will be more readable that way. v3 in a few days. + + +BR, +Jani. + + +> +> > (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 +> >