From: Mark Walters Date: Sun, 12 Feb 2012 09:21:14 +0000 (+0000) Subject: Re: [PATCH v3 2/3] emacs: Optionally hide some part headers. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c2789dd1729ca8294d7ff704ea483348ffbb289c;p=notmuch-archives.git Re: [PATCH v3 2/3] emacs: Optionally hide some part headers. --- diff --git a/cc/32fd0cb80d87fc9f4d24263aedd33a1d5c0d79 b/cc/32fd0cb80d87fc9f4d24263aedd33a1d5c0d79 new file mode 100644 index 000000000..4bc6e52f6 --- /dev/null +++ b/cc/32fd0cb80d87fc9f4d24263aedd33a1d5c0d79 @@ -0,0 +1,168 @@ +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 2B164431FB6 + for ; Sun, 12 Feb 2012 01:20:00 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 YIQYDwurL6Gv for ; + Sun, 12 Feb 2012 01:19:59 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 4BCB7431FAE + for ; Sun, 12 Feb 2012 01:19:59 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1RwVb9-0005q7-Gs; Sun, 12 Feb 2012 09:19:57 +0000 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1RwVb9-00064R-0O; Sun, 12 Feb 2012 09:19:55 +0000 +From: Mark Walters +To: David Edmondson , notmuch@notmuchmail.org +Subject: Re: [PATCH v3 2/3] emacs: Optionally hide some part headers. +In-Reply-To: <1328542748-19530-4-git-send-email-dme@dme.org> +References: <1327052612-1040-1-git-send-email-dme@dme.org> + <1328542748-19530-1-git-send-email-dme@dme.org> + <1328542748-19530-4-git-send-email-dme@dme.org> +User-Agent: Notmuch/0.11.1+172~g6a5d2c5 (http://notmuchmail.org) Emacs/23.2.1 + (i486-pc-linux-gnu) +Date: Sun, 12 Feb 2012 09:21:14 +0000 +Message-ID: <87ty2wif05.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 652e325df3b6bd62685f54e233565f48 (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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: Sun, 12 Feb 2012 09:20:00 -0000 + +On Mon, 6 Feb 2012 15:39:07 +0000, David Edmondson wrote: +> Add a regexp, `notmuch-show-part-headers-hidden' and if the +> content-type of a part matches, don't show the part header. +> --- +> emacs/notmuch-show.el | 43 ++++++++++++++++++++++++++++--------------- +> 1 files changed, 28 insertions(+), 15 deletions(-) +> +> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +> index 079d7cb..ce79762 100644 +> --- a/emacs/notmuch-show.el +> +++ b/emacs/notmuch-show.el +> @@ -125,6 +125,12 @@ indentation." +> (const :tag "View interactively" +> notmuch-show-interactively-view-part))) +> +> +(defcustom notmuch-show-part-headers-hidden nil +> + "Headers for parts whose content-type matches this regexp will +> +not be shown." +> + :group 'notmuch +> + :type 'regexp) +> + + +Hi + +I found this confusing for two reasons: first I thought the entire +content-type would have to match the regular expression but content-type +only needs to contain the regular expression. Secondly the value I typed +into the defcustom box seemed to need to be in quotes or I got an error +message. + +Best wishes + +Mark + +> (defmacro with-current-notmuch-show-message (&rest body) +> "Evaluate body with current buffer set to the text of current message" +> `(save-excursion +> @@ -397,24 +403,31 @@ message at DEPTH in the current thread." +> "Submap for button commands") +> (fset 'notmuch-show-part-button-map notmuch-show-part-button-map) +> +> +(defun notmuch-show-hidden-part-header (content-type) +> + "Return non-nil if a part header should be hidden for +> +CONTENT-TYPE parts." +> + (and notmuch-show-part-headers-hidden +> + (string-match notmuch-show-part-headers-hidden content-type))) +> + +> (defun notmuch-show-insert-part-header (nth content-type declared-type +> &optional name comment +> &rest button-parameters) +> - (apply #'insert-button +> - (concat "[ " +> - (if name (concat name ": ") "") +> - declared-type +> - (if (not (string-equal declared-type content-type)) +> - (concat " (as " content-type ")") +> - "") +> - (or comment "") +> - " ]") +> - :type 'notmuch-show-part-button-type +> - :notmuch-part nth +> - :notmuch-filename name +> - :notmuch-content-type content-type +> - button-parameters) +> - (insert "\n")) +> + (unless (notmuch-show-hidden-part-header content-type) +> + (apply #'insert-button +> + (concat "[ " +> + (if name (concat name ": ") "") +> + declared-type +> + (if (not (string-equal declared-type content-type)) +> + (concat " (as " content-type ")") +> + "") +> + (or comment "") +> + " ]") +> + :type 'notmuch-show-part-button-type +> + :notmuch-part nth +> + :notmuch-filename name +> + :notmuch-content-type content-type +> + button-parameters) +> + (insert "\n"))) +> +> ;; Functions handling particular MIME parts. +> +> -- +> 1.7.8.3 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch