From: Mark Walters Date: Sun, 12 Feb 2012 09:24:09 +0000 (+0000) Subject: Re: [PATCH v3 3/3] emacs: Don't insert a part header if it's the first part and text/*. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=14c0bc5946daaf3c0fb9a620000a5e857508a5d8;p=notmuch-archives.git Re: [PATCH v3 3/3] emacs: Don't insert a part header if it's the first part and text/*. --- diff --git a/ab/2af80082187bf9a7b71536e912e42d46dc3fd3 b/ab/2af80082187bf9a7b71536e912e42d46dc3fd3 new file mode 100644 index 000000000..3ed3e4487 --- /dev/null +++ b/ab/2af80082187bf9a7b71536e912e42d46dc3fd3 @@ -0,0 +1,131 @@ +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 652A2431FB6 + for ; Sun, 12 Feb 2012 01:22:53 -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 EwD7P5i5Js-Z for ; + Sun, 12 Feb 2012 01:22:52 -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 41909431FAE + for ; Sun, 12 Feb 2012 01:22:52 -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 1RwVdy-0006n6-Jx; Sun, 12 Feb 2012 09:22:50 +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 1RwVdy-00066r-6h; Sun, 12 Feb 2012 09:22:50 +0000 +From: Mark Walters +To: David Edmondson , notmuch@notmuchmail.org +Subject: Re: [PATCH v3 3/3] emacs: Don't insert a part header if it's the + first part and text/*. +In-Reply-To: <1328542748-19530-5-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-5-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:24:09 +0000 +Message-ID: <87r4y0ieva.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: 551b36241f23c236ec1fe649b0a482ec (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:22:53 -0000 + +On Mon, 6 Feb 2012 15:39:08 +0000, David Edmondson wrote: +> Previously this logic applied only to text/plain. Allow it for other +> text/* parts as well. + +What is the reason for treating the first part differently? + +Personally, I would prefer to keep it as now since pressing v on the +[text/html] `views' the message in my mailcap preferred html viewer +which can be convenient. + +Thanks + +Mark + + +> --- +> emacs/notmuch-show.el | 9 ++++----- +> 1 files changed, 4 insertions(+), 5 deletions(-) +> +> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +> index ce79762..c60e613 100644 +> --- a/emacs/notmuch-show.el +> +++ b/emacs/notmuch-show.el +> @@ -412,7 +412,9 @@ CONTENT-TYPE parts." +> (defun notmuch-show-insert-part-header (nth content-type declared-type +> &optional name comment +> &rest button-parameters) +> - (unless (notmuch-show-hidden-part-header content-type) +> + (unless (or (notmuch-show-hidden-part-header content-type) +> + (and (= nth 1) +> + (string-match "text/*" content-type))) +> (apply #'insert-button +> (concat "[ " +> (if name (concat name ": ") "") +> @@ -703,10 +705,7 @@ current buffer, if possible." +> +> (defun notmuch-show-insert-part-text/plain (msg part content-type nth depth declared-type) +> (let ((start (point))) +> - ;; If this text/plain part is not the first part in the message, +> - ;; insert a header to make this clear. +> - (if (> nth 1) +> - (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename))) +> + (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename)) +> (insert (notmuch-show-get-bodypart-content msg part nth)) +> (save-excursion +> (save-restriction +> -- +> 1.7.8.3 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch