From: Mark Walters Date: Sun, 14 Feb 2016 18:39:53 +0000 (+0000) Subject: [PATCH v5 1/7] emacs/show: Re-arrange determination if a part header is necessary X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4bbbe37cba5417037c345c79445b9b0cc59c16a;p=notmuch-archives.git [PATCH v5 1/7] emacs/show: Re-arrange determination if a part header is necessary --- diff --git a/f6/1cfdfa5dc1f05730f09645de68a52bcbba6c65 b/f6/1cfdfa5dc1f05730f09645de68a52bcbba6c65 new file mode 100644 index 000000000..53c293f0a --- /dev/null +++ b/f6/1cfdfa5dc1f05730f09645de68a52bcbba6c65 @@ -0,0 +1,139 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id EDE216DE1ABD + for ; Sun, 14 Feb 2016 10:40:22 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.245 +X-Spam-Level: +X-Spam-Status: No, score=-0.245 tagged_above=-999 required=5 tests=[AWL=0.325, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 6_C7_sSPvTsp for ; + Sun, 14 Feb 2016 10:40:21 -0800 (PST) +Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com + [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id AFEC06DE10C1 for + ; Sun, 14 Feb 2016 10:40:13 -0800 (PST) +Received: by mail-wm0-f67.google.com with SMTP id b205so4795312wmb.1 + for ; Sun, 14 Feb 2016 10:40:13 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=cz2au64fdOj5I+AU71A0uiMe2HpsCJ7bi5iFMjCPT4U=; + b=W8ju5XDl9F1vbCbKoeQ+B4cyiCMisx18nahqNBl8UQM+XjgymU9sGN4/N9jhrkKn5Z + ZZA57zjjlgn7kI1MVD7oG60TUZnRN8ScKyD1HoSHHmpL0Yp+WO9tTQuDh9mLXWISaj8O + G8npDCX3uWFGwuYw4boW7Ek1cj/YzoOCpb+SyjwsgI5T6se9FmkXAQnxOea1dyq1iIN7 + 5GfD7si6vgusAG59zlBiUIr7YIcZpJo7CS5QXtuLUaAip4VhnDKKmJTVbpdDfESQY/CO + u5loI20LsEGBgx/tuFvRmMSEAWeGd8A+36vNrE/pzlkQISEzMoRQ0nKjZZ5aobEotsVu + jg/A== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references; + bh=cz2au64fdOj5I+AU71A0uiMe2HpsCJ7bi5iFMjCPT4U=; + b=NbAEqy7+EhDW9oR03mrOAUw8Y1DNeWj/8qq9cZR27939HxP2HHQ1SDEWKYnpGSunYV + T5D4wdXyNpZpzWdQZPBxmaNctQWUS5asko1FuwSg4e+L+NZwPGH80KJJ47JfZ16at/o9 + QTFULp9g7YGwdXA5bZK/Clan40TDbfrIz4o4XtNkBe6P/+cvFGCu4lBUHvEWhh55s56p + SKv4eTvV+bhfX3GDVDM6S9ubVjTj3m7s5S0uOD4y2bqftMF8Cj9/6Zyr2/4h2RkVb600 + 1bzGgQteaSmhlYcpZKEInjnHEZYhyCsmYFdWhw92HCtPlwJtZd3V4uEnV7gFiJpJF5yz + OplA== +X-Gm-Message-State: + AG10YOQy+d0BmgXCaZUKT+TpJ+LtPQh0FvpRBBEcFRuX+fsXGx7EimWslNAuiJ4gaSDx4w== +X-Received: by 10.28.54.22 with SMTP id d22mr8191133wma.72.1455475212380; + Sun, 14 Feb 2016 10:40:12 -0800 (PST) +Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) + by smtp.gmail.com with ESMTPSA id a128sm12051876wmh.6.2016.02.14.10.40.10 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sun, 14 Feb 2016 10:40:11 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v5 1/7] emacs/show: Re-arrange determination if a part header + is necessary +Date: Sun, 14 Feb 2016 18:39:53 +0000 +Message-Id: <1455475199-32622-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com> +References: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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, 14 Feb 2016 18:40:23 -0000 + +From: David Edmondson + +Move the determination of whether a part header is required to a +distinct function. +--- + emacs/notmuch-show.el | 30 +++++++++++++++++++++--------- + 1 file changed, 21 insertions(+), 9 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 3345878..70cdb9d 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -927,6 +927,22 @@ will return nil if the CID is unknown or cannot be retrieved." + ;; showable this returns nil. + (notmuch-show-create-part-overlays button part-beg part-end)))) + ++(defun notmuch-show-mime-type (part) ++ "Return the correct mime-type to use for PART." ++ (let ((content-type (downcase (plist-get part :content-type)))) ++ (or (and (string= content-type "application/octet-stream") ++ (notmuch-show-get-mime-type-of-application/octet-stream part)) ++ (and (string= content-type "inline patch") ++ "text/x-diff") ++ content-type))) ++ ++(defun notmuch-show-insert-header-p (part hide) ++ "Return non-NIL if a header button should be inserted for this part." ++ ;; Show all part buttons except for the first part if it is text/plain. ++ (let ((mime-type (notmuch-show-mime-type part))) ++ (not (and (string= mime-type "text/plain") ++ (<= (plist-get part :id) 1))))) ++ + (defun notmuch-show-insert-bodypart (msg part depth &optional hide) + "Insert the body part PART at depth DEPTH in the current thread. + +@@ -937,20 +953,16 @@ is t, hide the part initially and show the button. If HIDE is + useful for quoting in replies)." + + (let* ((content-type (downcase (plist-get part :content-type))) +- (mime-type (or (and (string= content-type "application/octet-stream") +- (notmuch-show-get-mime-type-of-application/octet-stream part)) +- (and (string= content-type "inline patch") +- "text/x-diff") +- content-type)) ++ (mime-type (notmuch-show-mime-type part)) + (nth (plist-get part :id)) + (long (and (notmuch-match-content-type mime-type "text/*") + (> notmuch-show-max-text-part-size 0) + (> (length (plist-get part :content)) notmuch-show-max-text-part-size))) + (beg (point)) +- ;; We omit the part button for the first (or only) part if +- ;; this is text/plain, or HIDE is 'no-buttons. +- (button (unless (or (equal hide 'no-buttons) +- (and (string= mime-type "text/plain") (<= nth 1))) ++ ;; We show the part button if notmuch-show-insert-header-p ++ ;; says to, unless HIDE is 'no-buttons. ++ (button (when (and (not (equal hide 'no-buttons)) ++ (notmuch-show-insert-header-p part hide)) + (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename)))) + ;; Hide the part initially if HIDE is t, or if it is too long + ;; and we have a button to allow toggling (thus reply which +-- +2.1.4 +