X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-company.el;h=c6a004aebe92bcd447ee93729a54a2518052200b;hp=b50e73c8899bda57525bff9528920f17c479bc93;hb=HEAD;hpb=ced341e82e8cb84dc2c90187d208838335511f6e

diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el
index b50e73c8..7e05dc8f 100644
--- 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))
@@ -102,7 +101,6 @@
        (run-hook-with-args 'notmuch-address-post-completion-functions arg))
       (no-cache t))))
 
-
 (provide 'notmuch-company)
 
 ;;; notmuch-company.el ends here