emacs: Add new option notmuch-search-hide-excluded

[notmuch] / emacs / notmuch-company.el

diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el
index 4439cc15edbd7b426b465dbeb8bd30c20766c58f..7e05dc8f2a796aaf2c664fdcc4be63f6a443057f 100644 (file)
--- a/emacs/notmuch-company.el
+++ b/emacs/notmuch-company.el
@@ -32,8 +32,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl-lib))
-
 (require 'notmuch-lib)
 
 (defvar-local notmuch-company-last-prefix nil)
@@ -72,7 +70,8 @@
        (completion-ignore-case t))
     (cl-case command
       (interactive (company-begin-backend 'notmuch-company))
-      (prefix (and (derived-mode-p 'message-mode)
+      (prefix (and (or (derived-mode-p 'message-mode)
+                      (derived-mode-p 'org-msg-edit-mode))
                   (looking-back
                    (concat notmuch-address-completion-headers-regexp ".*")
                    (line-beginning-position))