X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=9247cdd50cb6e8be73b87e1aee5e99ac27b444b6;hp=b0fa5fb20c96b75383a70547bdba51b96bf8c1b0;hb=03fd69322b1583e1a05007d303d9fd15a54a02af;hpb=89d85e28b2dc9b0a75a963dd4042aa657ba871b8

diff --git a/notmuch.el b/notmuch.el
index b0fa5fb2..9247cdd5 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -309,7 +309,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 +484,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 +513,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 +539,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))))))