From: Mark Walters Date: Sat, 7 Nov 2015 11:04:31 +0000 (+0000) Subject: [PATCH v4 2/7] emacs/show: Accommodate the lack of part header buttons X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=164729555f8f2bf7ad04f4dad6ff9542a9e4deeb;p=notmuch-archives.git [PATCH v4 2/7] emacs/show: Accommodate the lack of part header buttons --- diff --git a/56/b2bbbcf0960738679df98125c42a9fd854fcc6 b/56/b2bbbcf0960738679df98125c42a9fd854fcc6 new file mode 100644 index 000000000..d6df18a5a --- /dev/null +++ b/56/b2bbbcf0960738679df98125c42a9fd854fcc6 @@ -0,0 +1,205 @@ +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 63DE86DE1A1F + for ; Sat, 7 Nov 2015 03:04:55 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.209 +X-Spam-Level: +X-Spam-Status: No, score=0.209 tagged_above=-999 required=5 tests=[AWL=0.079, + 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 7qvhWDYi5Aj9 for ; + Sat, 7 Nov 2015 03:04:53 -0800 (PST) +Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com + [74.125.82.47]) by arlo.cworth.org (Postfix) with ESMTPS id 729CC6DE1641 for + ; Sat, 7 Nov 2015 03:04:47 -0800 (PST) +Received: by wmll128 with SMTP id l128so59650236wml.0 + for ; Sat, 07 Nov 2015 03:04:46 -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=wM3/zNYHgIEi3p5igDA1A/8/4u/zXy6JX+XcFdkRBlo=; + b=bd696H9AXy07nBUuQU+kSn6NuR+OgTf8d5wXRkv6jODb5r5TPQJ8jnUG9AhqFd50Cc + 6cFruafvalECndIuWiBnlowRg5mSwVssjq5xloiNG8ECz0kyClbgJj9mgfBGwG3HEdV3 + cQC1pMiCsridG7nwbRjdqI7i8OZitWClhi3okWP7p6iqaVnf1ByzjgsKwHbXyMeeT5tb + KOS+13kkkal/nTZ1xh9oJGvESwvZOAoXjSQA+tPGxfX7DaMT15rDoX5wQsxrDiyjN0tM + RHq7rwOFkaVXdvZ1OQes9d91uqUP2yDWHeI3ngPwiF6TLCX056zApUp+lyBZYrgKx4JK + HPzw== +X-Received: by 10.28.214.141 with SMTP id n135mr16045295wmg.53.1446894286054; + Sat, 07 Nov 2015 03:04:46 -0800 (PST) +Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) + by smtp.gmail.com with ESMTPSA id l1sm4576870wjx.13.2015.11.07.03.04.44 + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 07 Nov 2015 03:04:44 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v4 2/7] emacs/show: Accommodate the lack of part header + buttons +Date: Sat, 7 Nov 2015 11:04:31 +0000 +Message-Id: <1446894276-7814-3-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:55 -0000 + +From: David Edmondson + +Various pieces of code assumed (reasonably) that part header buttons +are present. Modify them to avoid problems if no part headers were +inserted. +--- + emacs/notmuch-show.el | 88 ++++++++++++++++++++++++++++----------------------- + 1 file changed, 48 insertions(+), 40 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 47a02e5..9fc79e0 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -509,36 +509,37 @@ (defun notmuch-show-insert-part-header (nth content-type declared-type &optional + + (defun notmuch-show-toggle-part-invisibility (&optional button) + (interactive) +- (let* ((button (or button (button-at (point)))) +- (overlay (button-get button 'overlay)) +- (lazy-part (button-get button :notmuch-lazy-part))) +- ;; We have a part to toggle if there is an overlay or if there is a lazy part. +- ;; If neither is present we cannot toggle the part so we just return nil. +- (when (or overlay lazy-part) +- (let* ((show (button-get button :notmuch-part-hidden)) +- (new-start (button-start button)) +- (button-label (button-get button :base-label)) +- (old-point (point)) +- (properties (text-properties-at (button-start button))) +- (inhibit-read-only t)) +- ;; Toggle the button itself. +- (button-put button :notmuch-part-hidden (not show)) +- (goto-char new-start) +- (insert "[ " button-label (if show " ]" " (hidden) ]")) +- (set-text-properties new-start (point) properties) +- (let ((old-end (button-end button))) +- (move-overlay button new-start (point)) +- (delete-region (point) old-end)) +- (goto-char (min old-point (1- (button-end button)))) +- ;; Return nil if there is a lazy-part, it is empty, and we are +- ;; trying to show it. In all other cases return t. +- (if lazy-part +- (when show +- (button-put button :notmuch-lazy-part nil) +- (notmuch-show-lazy-part lazy-part button)) +- ;; else there must be an overlay. +- (overlay-put overlay 'invisible (not show)) +- t))))) ++ (let ((button (or button (button-at (point))))) ++ (when button ++ (let ((overlay (button-get button 'overlay)) ++ (lazy-part (button-get button :notmuch-lazy-part))) ++ ;; We have a part to toggle if there is an overlay or if there is a lazy part. ++ ;; If neither is present we cannot toggle the part so we just return nil. ++ (when (or overlay lazy-part) ++ (let* ((show (button-get button :notmuch-part-hidden)) ++ (new-start (button-start button)) ++ (button-label (button-get button :base-label)) ++ (old-point (point)) ++ (properties (text-properties-at (button-start button))) ++ (inhibit-read-only t)) ++ ;; Toggle the button itself. ++ (button-put button :notmuch-part-hidden (not show)) ++ (goto-char new-start) ++ (insert "[ " button-label (if show " ]" " (hidden) ]")) ++ (set-text-properties new-start (point) properties) ++ (let ((old-end (button-end button))) ++ (move-overlay button new-start (point)) ++ (delete-region (point) old-end)) ++ (goto-char (min old-point (1- (button-end button)))) ++ ;; Return nil if there is a lazy-part, it is empty, and we are ++ ;; trying to show it. In all other cases return t. ++ (if lazy-part ++ (when show ++ (button-put button :notmuch-lazy-part nil) ++ (notmuch-show-lazy-part lazy-part button)) ++ ;; else there must be an overlay. ++ (overlay-put overlay 'invisible (not show)) ++ t))))))) + + ;; Part content ID handling + +@@ -647,14 +648,17 @@ (defun notmuch-show-insert-part-multipart/related (msg part content-type nth dep + t) + + (defun notmuch-show-insert-part-multipart/signed (msg part content-type nth depth button) +- (button-put button 'face 'notmuch-crypto-part-header) +- ;; add signature status button if sigstatus provided ++ (when button ++ (button-put button 'face 'notmuch-crypto-part-header)) ++ ;; Add signature status button if sigstatus provided. + (if (plist-member part :sigstatus) + (let* ((from (notmuch-show-get-header :From msg)) + (sigstatus (car (plist-get part :sigstatus)))) + (notmuch-crypto-insert-sigstatus-button sigstatus from)) +- ;; if we're not adding sigstatus, tell the user how they can get it +- (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")) ++ ;; If we're not adding the signature status, tell the user how ++ ;; they can get it. ++ (when button ++ (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts."))) + + (let ((inner-parts (plist-get part :content)) + (start (point))) +@@ -668,17 +672,20 @@ (defun notmuch-show-insert-part-multipart/signed (msg part content-type nth dept + t) + + (defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth button) +- (button-put button 'face 'notmuch-crypto-part-header) +- ;; add encryption status button if encstatus specified ++ (when button ++ (button-put button 'face 'notmuch-crypto-part-header)) ++ ;; Add encryption status button if encryption status is specified. + (if (plist-member part :encstatus) + (let ((encstatus (car (plist-get part :encstatus)))) + (notmuch-crypto-insert-encstatus-button encstatus) +- ;; add signature status button if sigstatus specified ++ ;; Add signature status button if signature status is ++ ;; specified. + (if (plist-member part :sigstatus) + (let* ((from (notmuch-show-get-header :From msg)) + (sigstatus (car (plist-get part :sigstatus)))) + (notmuch-crypto-insert-sigstatus-button sigstatus from)))) +- ;; if we're not adding encstatus, tell the user how they can get it ++ ;; If we're not adding the encryption status, tell the user how ++ ;; they can get it. + (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")) + + (let ((inner-parts (plist-get part :content)) +@@ -977,8 +984,9 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide) + + (if show-part + (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button) +- (button-put button :notmuch-lazy-part +- (list msg part mime-type nth depth button))) ++ (when button ++ (button-put button :notmuch-lazy-part ++ (list msg part mime-type nth depth button)))) + + ;; Some of the body part handlers leave point somewhere up in the + ;; part, so we make sure that we're down at the end. +-- +2.1.4 +