emacs: Make message-summary button extend to very beginning of message.

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index b3f67d2b5f38ab4f311f1c07861c0d2466fd9576..bf7e46f6c47dfd2d2ff76d8a3ea86dd7847c8bd2 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -574,14 +574,19 @@ which this thread was originally shown."
   (force-window-update)
   (redisplay t))
 
-(define-button-type 'notmuch-button-invisibility-toggle-type 'action 'notmuch-toggle-invisible-action 'follow-link t)
+(define-button-type 'notmuch-button-invisibility-toggle-type
+  'action 'notmuch-toggle-invisible-action
+  'follow-link t
+  'face "default")
 (define-button-type 'notmuch-button-citation-toggle-type 'help-echo "mouse-1, RET: Show citation"
   :supertype 'notmuch-button-invisibility-toggle-type)
 (define-button-type 'notmuch-button-signature-toggle-type 'help-echo "mouse-1, RET: Show signature"
   :supertype 'notmuch-button-invisibility-toggle-type)
 (define-button-type 'notmuch-button-headers-toggle-type 'help-echo "mouse-1, RET: Show headers"
   :supertype 'notmuch-button-invisibility-toggle-type)
-(define-button-type 'notmuch-button-body-toggle-type 'help-echo "mouse-1, RET: Show message"
+(define-button-type 'notmuch-button-body-toggle-type
+  'help-echo "mouse-1, RET: Show message"
+  'face 'notmuch-message-summary-face
   :supertype 'notmuch-button-invisibility-toggle-type)
 
 (defun notmuch-show-markup-citations-region (beg end depth)
@@ -724,7 +729,18 @@ which this thread was originally shown."
              (overlay-put (make-overlay (point) (re-search-forward ".*$"))
                           'face 'message-header-other)))))))
 
-(defun notmuch-show-markup-header (depth)
+(defun notmuch-show-markup-header (message-begin depth)
+  "Buttonize and decorate faces in a message header.
+
+MESSAGE-BEGIN is the position of the absolute first character in
+the message (including all delimiters that will end up being
+invisible etc.). This is to allow a button to reliably extend to
+the beginning of the message even if point is positioned at an
+invisible character (such as the beginning of the buffer).
+
+DEPTH specifies the depth at which this message appears in the
+tree of the current thread, (the top-level messages have depth 0
+and each reply increases depth by 1)."
   (re-search-forward notmuch-show-header-begin-regexp)
   (forward-line)
   (let ((beg (point-marker))
@@ -737,8 +753,7 @@ which this thread was originally shown."
     (let ((end (point-marker)))
       (indent-rigidly beg end depth)
       (goto-char beg)
-      (overlay-put (make-overlay (line-beginning-position) summary-end) 'face 'notmuch-message-summary-face)
-      (setq btn (make-button (line-beginning-position) summary-end :type 'notmuch-button-body-toggle-type))
+      (setq btn (make-button message-begin summary-end :type 'notmuch-button-body-toggle-type))
       (forward-line)
       (add-to-invisibility-spec invis-spec)
       (overlay-put (make-overlay subject-end end)
@@ -762,11 +777,11 @@ which this thread was originally shown."
 
 (defun notmuch-show-markup-message ()
   (if (re-search-forward notmuch-show-message-begin-regexp nil t)
-      (progn
+      (let ((message-begin (match-beginning 0)))
        (re-search-forward notmuch-show-depth-regexp)
        (let ((depth (string-to-number (buffer-substring (match-beginning 1) (match-end 1))))
               (btn nil))
-         (setq btn (notmuch-show-markup-header depth))
+         (setq btn (notmuch-show-markup-header message-begin depth))
          (notmuch-show-markup-body depth btn)))
     (goto-char (point-max))))