emacs: Report a lack of matches when calling `notmuch-show'.

[notmuch] / emacs / notmuch-mua.el

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index a66a30668ed03889612e27bb5aca540c58a21bfc..d4fad7b743100c977184a296d7eebc30b6d4289b 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -29,6 +29,8 @@
 (eval-when-compile (require 'cl))
 
 (declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))
+(declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ())
+(declare-function notmuch-fcc-handler "notmuch-maildir-fcc" (destdir))
 
 ;;
 
@@ -278,7 +280,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil."
 (define-key notmuch-message-mode-map (kbd "C-c C-c") #'notmuch-mua-send-and-exit)
 (define-key notmuch-message-mode-map (kbd "C-c C-s") #'notmuch-mua-send)
 
-(defun notmuch-mua-pop-to-buffer (name)
+(defun notmuch-mua-pop-to-buffer (name switch-function)
   "Pop to buffer NAME, and warn if it already exists and is
 modified. This function is notmuch addaptation of
 `message-pop-to-buffer'."
@@ -291,7 +293,7 @@ modified. This function is notmuch addaptation of
              (progn
                (gnus-select-frame-set-input-focus (window-frame window))
                (select-window window))
-           (funcall (notmuch-mua-get-switch-function) buffer)
+           (funcall switch-function buffer)
            (set-buffer buffer))
          (when (and (buffer-modified-p)
                     (not (prog1
@@ -299,7 +301,7 @@ modified. This function is notmuch addaptation of
                               "Message already being composed; erase? ")
                            (message nil))))
            (error "Message being composed")))
-      (funcall (notmuch-mua-get-switch-function) name)
+      (funcall switch-function name)
       (set-buffer name))
     (erase-buffer)
     (notmuch-message-mode)))
@@ -319,19 +321,26 @@ modified. This function is notmuch addaptation of
     (push (cons 'From (concat
                       (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))
 
-  (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to))
-  (message-setup-1
-   ;; The following sexp is copied from `message-mail'
-   (nconc
-    `((To . ,(or to "")) (Subject . ,(or subject "")))
-    ;; C-h f compose-mail says that headers should be specified as
-    ;; (string . value); however all the rest of message expects
-    ;; headers to be symbols, not strings (eg message-header-format-alist).
-    ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
-    ;; We need to convert any string input, eg from rmail-start-mail.
-    (dolist (h other-headers other-headers)
-      (if (stringp (car h)) (setcar h (intern (capitalize (car h)))))))
-   yank-action send-actions return-action)
+  (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to)
+                            (or switch-function (notmuch-mua-get-switch-function)))
+  (let ((headers
+        (append
+         ;; The following is copied from `message-mail'
+         `((To . ,(or to "")) (Subject . ,(or subject "")))
+         ;; C-h f compose-mail says that headers should be specified as
+         ;; (string . value); however all the rest of message expects
+         ;; headers to be symbols, not strings (eg message-header-format-alist).
+         ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
+         ;; We need to convert any string input, eg from rmail-start-mail.
+         (dolist (h other-headers other-headers)
+           (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))))
+       (args (list yank-action send-actions)))
+    ;; message-setup-1 in Emacs 23 does not accept return-action
+    ;; argument. Pass it only if it is supplied by the caller. This
+    ;; will never be the case when we're called by `compose-mail' in
+    ;; Emacs 23.
+    (when return-action (nconc args '(return-action)))
+    (apply 'message-setup-1 headers args))
   (notmuch-fcc-header-setup)
   (message-sort-headers)
   (message-hide-headers)