--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\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 09A47431FC2\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:09:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ 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 i-4cPO4TtzHM for <notmuch@notmuchmail.org>;\r
+ Mon, 12 May 2014 15:09:38 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+ [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 13235431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:09:37 -0700 (PDT)\r
+Received: by mail-wi0-f179.google.com with SMTP id bs8so5295556wib.0\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:09:35 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version:content-type;\r
+ bh=9v5pVKRXzGjfLG7NDUBE5FhJWbb3xKQXVRIAz1xk1iw=;\r
+ b=uiCzT+f7pnsCKTHrZTf14XtCFCyJbsO+MjnXfsZvSW76rNlbdBFbND047C/bxFBNpk\r
+ 4AAjpvqbdY5KRPeRbPa3Wq33gl1th2DSJR4jIo07/t5DFMNJp0n/xZZ1QvFEbDFzDayA\r
+ DKWLEyKicQXY5pJzNr11t/fTv4WkSNeDtaJ7JN50eS/IuqsIP6G9p4aYG85327ALZ8Sm\r
+ 470MKlO04xuWZx0e5W7Oni2ZmW4AOilE0IbHtRXgcvgLTP10Hlebtjd3shonh9w3VdE/\r
+ 5dl99w+SspXLnW2M4tSZ0SbQ6ecriRgA9y9VCKePOum9jkRXS6oYjdnLrbMMy9irQcIr\r
+ 4aOw==\r
+X-Received: by 10.180.106.194 with SMTP id gw2mr17795045wib.47.1399932575656; \r
+ Mon, 12 May 2014 15:09:35 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by mx.google.com with ESMTPSA id em5sm8590044wic.23.2014.05.12.15.09.34\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Mon, 12 May 2014 15:09:35 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 1/9] emacs/show: Re-arrange determination if a part\r
+ header is necessary\r
+In-Reply-To: <1399897769-26809-2-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+ <1399897769-26809-1-git-send-email-dme@dme.org>\r
+ <1399897769-26809-2-git-send-email-dme@dme.org>\r
+User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 12 May 2014 23:09:32 +0100\r
+Message-ID: <87sioek5sz.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Mon, 12 May 2014 22:09:44 -0000\r
+\r
+\r
+On Mon, 12 May 2014, David Edmondson <dme@dme.org> wrote:\r
+> Move the determination of whether a part header is required to a\r
+> distinct function.\r
+> ---\r
+> emacs/notmuch-show.el | 25 ++++++++++++++++++-------\r
+> 1 file changed, 18 insertions(+), 7 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 10fc872..ec99141 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -871,6 +871,21 @@ message at DEPTH in the current thread."\r
+> ;; showable this returns nil.\r
+> (notmuch-show-create-part-overlays button part-beg part-end))))\r
+> \r
+> +(defun notmuch-show-mime-type (part)\r
+> + "Return the correct mime-type to use for PART."\r
+> + (let ((content-type (downcase (plist-get part :content-type))))\r
+> + (or (and (string= content-type "application/octet-stream")\r
+> + (notmuch-show-get-mime-type-of-application/octet-stream part))\r
+> + (and (string= content-type "inline patch")\r
+> + "text/x-diff")\r
+> + content-type)))\r
+> +\r
+> +(defun notmuch-show-insert-header-p (part)\r
+> + "Return non-NIL if a header button should be inserted for this part."\r
+> + (let ((mime-type (notmuch-show-mime-type part)))\r
+> + (not (and (string= mime-type "text/plain")\r
+> + (<= (plist-get part :id) 1)))))\r
+\r
+My only query here is whether a notmuch-show-hide-header-p (part) might\r
+make some of the logic clearer?\r
+\r
+MW\r
+\r
+\r
+> +\r
+> (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\r
+> "Insert the body part PART at depth DEPTH in the current thread.\r
+> \r
+> @@ -881,19 +896,15 @@ is t, hide the part initially and show the button. If HIDE is\r
+> useful for quoting in replies)."\r
+> \r
+> (let* ((content-type (downcase (plist-get part :content-type)))\r
+> - (mime-type (or (and (string= content-type "application/octet-stream")\r
+> - (notmuch-show-get-mime-type-of-application/octet-stream part))\r
+> - (and (string= content-type "inline patch")\r
+> - "text/x-diff")\r
+> - content-type))\r
+> + (mime-type (notmuch-show-mime-type part))\r
+> (nth (plist-get part :id))\r
+> (beg (point))\r
+> ;; Hide the part initially if HIDE is t.\r
+> (show-part (not (equal hide t)))\r
+> ;; We omit the part button for the first (or only) part if\r
+> ;; this is text/plain, or HIDE is 'no-buttons.\r
+> - (button (unless (or (equal hide 'no-buttons)\r
+> - (and (string= mime-type "text/plain") (<= nth 1)))\r
+> + (button (when (and (not (equal hide 'no-buttons))\r
+> + (notmuch-show-insert-header-p part))\r
+> (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))\r
+> (content-beg (point)))\r
+> \r
+> -- \r
+> 2.0.0.rc0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff