DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=sender:from:to:subject:date:message-id:mime-version:content-type;
	b=gK9eDOCXgpavPOnM6y3rF0h5h5AoSpPV1yPxHMnpREcG2elma6/JA6mL+LDmpwbvw8
	LEUfj7iAx2m0gwlYSprcj6VYK/l1uy+PvGH/3Yhu6WuehRLAz4uYkfjI+MMOlTmtsBUV
	UlVOzEdyb9XgvcU6YxxWc5Zy0vdP+01SxVNDc=
Sender: Pablo Oliveira <pablo.oliveira@gmail.com>
From: Pablo Oliveira <pablo@sifflez.org>
To: notmuch@notmuchmail.org
Date: Wed, 30 Dec 2009 13:25:40 +0100
Message-ID: <87bphgodh7.fsf@sifflez.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: [notmuch] [PATCH] Goto-Address mode hides the body toggle button on
	messages of zero depth.
Precedence: list

In this patch we increment depth by one for all messages, so that the 
first character of the header is always a space. Without this patch, 
the first character may be part of the sender email address, which is 
buttonized by Goto-Address minor mode, therefore hiding the 
notmuch-button-body-toggle-type button, and forcing us to do an 
additional C-e to hit it.

Signed-off-by: Pablo Oliveira <pablo@sifflez.org>
---
 notmuch.el |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/notmuch.el b/notmuch.el
index 97914f2..93f61c5 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -774,7 +774,11 @@ and each reply increases depth by 1)."
   (if (re-search-forward notmuch-show-message-begin-regexp nil t)
       (let ((message-begin (match-beginning 0)))
 	(re-search-forward notmuch-show-depth-match-regexp)
-	(let ((depth (string-to-number (buffer-substring (match-beginning 1) (match-end 1))))
+	;; We increment depth by one, so that the first character of the header
+	;; is a space. Before this, the first character was part of the sender
+	;; email address, which is buttonized by Goto-Address minor mode,
+	;; therefore hiding the notmuch-button-body-toggle-type button.
+	(let ((depth (1+ (string-to-number (buffer-substring (match-beginning 1) (match-end 1)))))
 	      (match (string= "1" (buffer-substring (match-beginning 2) (match-end 2))))
               (btn nil))
 	  (setq btn (notmuch-show-markup-header message-begin depth))
-- 
1.6.3.3