From 71b7bd51c6a34472062cbe749ceb639210f7647d Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 7 Nov 2015 11:04:30 +0000 Subject: [PATCH] [PATCH v4 1/7] emacs/show: Re-arrange determination if a part header is necessary --- 03/f832f443df5fea03dc5778c0f87b420e7a8334 | 123 ++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 03/f832f443df5fea03dc5778c0f87b420e7a8334 diff --git a/03/f832f443df5fea03dc5778c0f87b420e7a8334 b/03/f832f443df5fea03dc5778c0f87b420e7a8334 new file mode 100644 index 000000000..62c1a3b01 --- /dev/null +++ b/03/f832f443df5fea03dc5778c0f87b420e7a8334 @@ -0,0 +1,123 @@ +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 9E3F46DE1704 + for ; Sat, 7 Nov 2015 03:04:47 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.216 +X-Spam-Level: +X-Spam-Status: No, score=0.216 tagged_above=-999 required=5 tests=[AWL=0.086, + 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_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 JPS_-oNifwib for ; + Sat, 7 Nov 2015 03:04:45 -0800 (PST) +Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com + [74.125.82.43]) by arlo.cworth.org (Postfix) with ESMTPS id 79D4E6DE1638 for + ; Sat, 7 Nov 2015 03:04:45 -0800 (PST) +Received: by wmec201 with SMTP id c201so36450094wme.1 + for ; Sat, 07 Nov 2015 03:04:43 -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=J/qV1mSM63xzZqbo3TsxfCcFBNS/xFk3u/GRd8Szh6Q=; + b=PTVsNniNA+r61PuykV9umQAiYPkfK+PA+R2y8RIqPp3XUkPm2H7F8vZzp2YVyVWs7n + rJ8t36JEp8DwlRK18kQs+ZI7uF8rw7hAiFB86FivPa0wptHJS7iJvmkbs4x39MP4b68z + XE52qRXqcovDZp9IMxMnJ099smU+SHKfM+9ptKPS/5kZHiooXZUXTkggCV7eq2w3GJTC + XXFNVTxuv1pTA2pxu3GprvUPXcZHN4BkFzdp7evhmv98eu+XEsL+KjThKW2UA5boysH9 + ACYO/Sf6Nfkun4yoCDI6F9X88qZBQm6KRy0lUCxQ8MMn4vZJponOJeAuPs+e/dqrQZTK + 7Unw== +X-Received: by 10.28.137.194 with SMTP id l185mr14649082wmd.21.1446894283619; + Sat, 07 Nov 2015 03:04:43 -0800 (PST) +Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) + by smtp.gmail.com with ESMTPSA id 71sm3418994wmm.24.2015.11.07.03.04.42 + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 07 Nov 2015 03:04:42 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v4 1/7] emacs/show: Re-arrange determination if a part header + is necessary +Date: Sat, 7 Nov 2015 11:04:30 +0000 +Message-Id: <1446894276-7814-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com> +References: <1446894276-7814-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: Sat, 07 Nov 2015 11:04:47 -0000 + +From: David Edmondson + +Move the determination of whether a part header is required to a +distinct function. +--- + emacs/notmuch-show.el | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 49fd198..47a02e5 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -929,6 +929,21 @@ (defun notmuch-show-lazy-part (part-args button) + ;; 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." ++ (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. + +@@ -939,11 +954,7 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide) + 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) +@@ -951,8 +962,8 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide) + (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))) ++ (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 + -- 2.26.2