X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=1f2446132303938d76d397586630a7423fd2ddf2;hp=763c85fffe7971cdf011299315274e7072db6bea;hb=265be025c2372de16f526a6bb85f627651632b6d;hpb=b38bd7efd83a8b7ea2c961060d8007efa055b9b6

diff --git a/notmuch.el b/notmuch.el
index 763c85ff..1f244613 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -289,6 +289,7 @@ buffer."
 (defun notmuch-reply (query-string)
   (switch-to-buffer (generate-new-buffer "notmuch-draft"))
   (call-process notmuch-command nil t nil "reply" query-string)
+  (message-insert-signature)
   (goto-char (point-min))
   (if (re-search-forward "^$" nil t)
       (progn
@@ -309,7 +310,8 @@ The given command will be executed with the raw contents of the
 current email message as stdin. Anything printed by the command
 to stdout or stderr will appear in the *Messages* buffer."
   (interactive "sPipe message to command: ")
-  (apply 'start-process-shell-command "notmuch-pipe-command" "*notmuch-pipe*" (split-string (concat command " < " (notmuch-show-get-filename)))))
+  (apply 'start-process-shell-command "notmuch-pipe-command" "*notmuch-pipe*"
+	 (list command " < " (shell-quote-argument (notmuch-show-get-filename)))))
 
 (defun notmuch-show-move-to-current-message-summary-line ()
   "Move to the beginning of the one-line summary of the current message.
@@ -483,7 +485,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 +514,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 +540,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))))))
@@ -593,9 +598,19 @@ which this thread was originally shown."
       (re-search-forward notmuch-show-header-end-regexp)
       (beginning-of-line)
       (let ((end (point-marker)))
+        (goto-char beg)
+        (forward-line)
+        (while (looking-at "[A-Za-z][-A-Za-z0-9]*:")
+          (beginning-of-line)
+          (overlay-put (make-overlay (point) (re-search-forward ":"))
+                       'face 'bold)
+          (forward-line)
+          )
 	(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)