switch to button-1, which seems to interact poorly with text-selection by mouse

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index 70dbe5ba7f6baaf8ebfec6cce86e1ea73234df1a..59277379f3bf46dfbcff3aa0cac698bccab80c02 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -483,7 +483,8 @@ which this thread was originally shown."
             (remove-from-invisibility-spec invis-spec)
           (add-to-invisibility-spec invis-spec)
           ))
-  (goto-char (button-end cite-button)))
+  (force-window-update)
+  (redisplay t))
 
 (defun notmuch-show-markup-citations-region (beg end depth)
   (goto-char beg)
@@ -511,8 +512,9 @@ which this thread was originally shown."
                 (let ((cite-button (insert-button cite-button-text)))
                   (button-put cite-button 'invisibility-spec invis-spec)
                   (button-put cite-button 'action 'notmuch-toggle-invisible-action)
+                  (button-put cite-button 'follow-link t)
                   (button-put cite-button 'help-echo
-                              "mouse-2, RET: Show citation")
+                              "mouse-1, RET: Show citation")
 
                   )
                 (insert "\n")
@@ -536,8 +538,9 @@ which this thread was originally shown."
                       (button-put sig-button 'invisibility-spec invis-spec)
                       (button-put sig-button 'action
                                   'notmuch-toggle-invisible-action)
+                      (button-put sig-button 'follow-link t)
                       (button-put sig-button 'help-echo
-                                  "mouse-2, RET: Show signature")
+                                  "mouse-1, RET: Show signature")
                       )
                     (insert "\n")
                     (goto-char end))))))
@@ -604,6 +607,8 @@ which this thread was originally shown."
        (indent-rigidly beg end depth)
        (overlay-put (make-overlay beg-hidden end)
                     'invisible 'notmuch-show-header)
+        (goto-char end)
+        (insert "\n")
        (set-marker beg nil)
        (set-marker beg-hidden nil)
        (set-marker end nil)