From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v4 0/5] Use invisibility to toggle display of all parts
	including multipart
Date: Mon, 17 Dec 2012 21:54:42 +0000
Message-Id: <1355781287-6010-1-git-send-email-markwalters1009@gmail.com>
Precedence: list

This is version 4 of this series (previous version at
id:1355559338-14313-1-git-send-email-markwalters1009@gmail.com).

The only change should be a bugfix which, for reasons I don't
understand, only causes a problem on emacs 24. The problem is that the
part invisibility code looks for a part button at the start of the
region. This gets confused if there is a part with no part button
(this is the case for the first part if it is text/plain) and the part
starts with a button (as can happen if the message starts with the
reply as in the first test in test/emacs-show).

This checks that the button is a part button before creating the part
overlay.

The diff is below the diffstat. 

Best wishes

Mark



Mark Walters (5):
  emacs: show: modify insert-part-header to save the button text
  emacs: show: add overlays for each part
  emacs: show: add invisibility button action
  emacs: wash: fix fake-diff part to include msg parameter
  emacs: show: set default show-all-multipart/alternatives to nil

 emacs/notmuch-show.el |  115 ++++++++++++++++++++++++++++++++++++++-----------
 emacs/notmuch-wash.el |    2 +-
 2 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 5ca6fe2..3816e32 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -865,8 +865,10 @@ message at DEPTH in the current thread."
   (let* ((button (button-at beg))
 	 (part-beg (and button (1+ (button-end button)))))
 
-    ;; If the part contains no text we do not make it toggleable.
-    (when (and button (/= part-beg end))
+    ;; If the part contains no text we do not make it toggleable. We
+    ;; also need to check that the button is a genuine part button not
+    ;; a notmuch-wash button.
+    (when (and button (/= part-beg end) (button-get button :base-label))
       (let ((base-label (button-get button :base-label))
 	    (overlay (make-overlay part-beg end))
 	    (message-invis-spec (plist-get msg :message-invis-spec))
-- 
1.7.9.1