X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=53af301a93d623ffc44b633f98ab369edf7d5a06;hb=7135a8bcbf0cf17931af3f017bce81bb557ea1eb;hp=916b39e390e59af47cee1a838cadbed1463401ee;hpb=8cbb5114a20c1217f23977fd5edca99a0b7a2955;p=notmuch diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 916b39e3..53af301a 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -30,9 +30,9 @@ (require 'notmuch-lib) (require 'notmuch-query) (require 'notmuch-wash) +(require 'notmuch-mua) (declare-function notmuch-call-notmuch-process "notmuch" (&rest args)) -(declare-function notmuch-reply "notmuch" (query-string)) (declare-function notmuch-fontify-headers "notmuch" nil) (declare-function notmuch-select-tag-with-completion "notmuch" (prompt &rest search-terms)) (declare-function notmuch-search-show-thread "notmuch" nil) @@ -470,8 +470,8 @@ function is used. " (save-excursion (let* ((basic-args (list thread-id)) (args (if query-context - (append basic-args (list "and (" query-context ")")) - basic-args))) + (append (list "\"") basic-args (list "and (" query-context ")\"")) + (append (list "\"") basic-args (list "\""))))) (notmuch-show-insert-forest (notmuch-query-get-threads args)) ;; If the query context reduced the results to nothing, run ;; the basic query. @@ -507,7 +507,7 @@ function is used. " (define-key map (kbd "M-TAB") 'notmuch-show-previous-button) (define-key map (kbd "TAB") 'notmuch-show-next-button) (define-key map "s" 'notmuch-search) - (define-key map "m" 'message-mail) + (define-key map "m" 'notmuch-mua-mail) (define-key map "f" 'notmuch-show-forward-message) (define-key map "r" 'notmuch-show-reply) (define-key map "|" 'notmuch-show-pipe-message) @@ -804,20 +804,22 @@ any effects from previous calls to (defun notmuch-show-reply () "Reply to the current message." (interactive) - (notmuch-reply (notmuch-show-get-message-id))) + (notmuch-mua-reply (notmuch-show-get-message-id))) (defun notmuch-show-forward-message () "Forward the current message." (interactive) (with-current-notmuch-show-message - (message-forward))) + (notmuch-mua-forward-message))) (defun notmuch-show-next-message () "Show the next message." (interactive) - (notmuch-show-goto-message-next) - (notmuch-show-mark-read) - (notmuch-show-message-adjust)) + (if (notmuch-show-goto-message-next) + (progn + (notmuch-show-mark-read) + (notmuch-show-message-adjust)) + (goto-char (point-max)))) (defun notmuch-show-previous-message () "Show the previous message." @@ -829,10 +831,14 @@ any effects from previous calls to (defun notmuch-show-next-open-message () "Show the next message." (interactive) - (while (and (notmuch-show-goto-message-next) - (not (notmuch-show-message-visible-p)))) - (notmuch-show-mark-read) - (notmuch-show-message-adjust)) + (let (r) + (while (and (setq r (notmuch-show-goto-message-next)) + (not (notmuch-show-message-visible-p)))) + (if r + (progn + (notmuch-show-mark-read) + (notmuch-show-message-adjust)) + (goto-char (point-max))))) (defun notmuch-show-previous-open-message () "Show the previous message."