From a5a3be2b70b35caa959ccfd6fe373ebcc532e71a Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Mon, 12 May 2014 13:29:23 +0100 Subject: [PATCH] [PATCH v3 3/9] emacs/show: Accommodate the lack of part header buttons --- a8/ee74be24c52f3722360a8c1d71f9d810ed082b | 210 ++++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 a8/ee74be24c52f3722360a8c1d71f9d810ed082b diff --git a/a8/ee74be24c52f3722360a8c1d71f9d810ed082b b/a8/ee74be24c52f3722360a8c1d71f9d810ed082b new file mode 100644 index 000000000..54b1590b0 --- /dev/null +++ b/a8/ee74be24c52f3722360a8c1d71f9d810ed082b @@ -0,0 +1,210 @@ +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 B1885431FC2 + for ; Mon, 12 May 2014 05:29:43 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 VrG3s8aRV+5u for ; + Mon, 12 May 2014 05:29:38 -0700 (PDT) +Received: from mail-we0-f169.google.com (mail-we0-f169.google.com + [74.125.82.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id DF9BC431FC9 + for ; Mon, 12 May 2014 05:29:33 -0700 (PDT) +Received: by mail-we0-f169.google.com with SMTP id u56so6864113wes.28 + for ; Mon, 12 May 2014 05:29:32 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to + :references; + bh=WPZlGZYbpH1b/MkEKfmRPD6mQPqcX7o640i99rZjADA=; + b=OVJkKTbeiNAl+dvDCZek0M1Yl+DkdBMRHciU4XODUBhoxlduLfcexrGR5t2yNtDvbs + u2XfUEeMCVvU8u3NcGAZ5o1YiLQ4Jzo95fItcpWdTAJ1/hbhNMj/Vscflk1o1LWc/F9r + QHPAUAbLKtHWHnVQYFlutcGN8d3ytl7HTQ3Ixyt4D/6vHVeYFf1sTcrePbYZ3nTyV7Gm + s4jdtQs/aNLoAX8FJRS8EMcIf3tfbJASeIu1kP2LinrHlH15zcgGoCGfkjp0/iDwthtM + wWiNNKjx5ADpq0IvUubWbPAwFYbDDso5bKMO7na7PuUWdUQfOjH36V//nFKTPbS4QIBJ + xvzg== +X-Gm-Message-State: + ALoCoQll/F3i7PX6qQYqv1tyZxjLOZdr7ZdxMS1DeHub0/m35AfGxzEeUoLUTG2YJlg2HQxBu1eJ +X-Received: by 10.180.78.225 with SMTP id e1mr15384000wix.17.1399897772761; + Mon, 12 May 2014 05:29:32 -0700 (PDT) +Received: from hotblack-desiato.hh.sledj.net (disaster-area.hh.sledj.net. + [81.149.164.25]) by mx.google.com with ESMTPSA id + pj5sm15865576wic.20.2014.05.12.05.29.30 for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 12 May 2014 05:29:30 -0700 (PDT) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id 3C1EB10B326; Mon, 12 May 2014 13:29:29 +0100 (BST) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v3 3/9] emacs/show: Accommodate the lack of part header + buttons +Date: Mon, 12 May 2014 13:29:23 +0100 +Message-Id: <1399897769-26809-4-git-send-email-dme@dme.org> +X-Mailer: git-send-email 2.0.0.rc0 +In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org> +References: <87sixdujkv.fsf@qmul.ac.uk> + <1399897769-26809-1-git-send-email-dme@dme.org> +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: Mon, 12 May 2014 12:29:44 -0000 + +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 f78a0ab..e511655 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -494,36 +494,37 @@ message at DEPTH in the current thread." + + (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))))))) + + ;; MIME part renderers + +@@ -632,14 +633,17 @@ message at DEPTH in the current thread." + 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))) +@@ -653,17 +657,20 @@ message at DEPTH in the current thread." + 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)) +@@ -930,8 +937,9 @@ useful for quoting in replies)." + + (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.0.0.rc0 + -- 2.26.2