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