Merge commit '60d4c09c982a1c562a70cd6aa705f47ab3badcfb' from company

[gnu-emacs-elpa] / packages / company / company-bbdb.el

diff --git a/packages/company/company-bbdb.el b/packages/company/company-bbdb.el
index acdd30ac14922aeb683bb1e14984cd3202736c06..22741a2051664a3c01c48b2238de652aa2c802fe 100644 (file)
--- a/packages/company/company-bbdb.el
+++ b/packages/company/company-bbdb.el
@@ -27,6 +27,12 @@
 (declare-function bbdb-dwim-mail "bbdb-com")
 (declare-function bbdb-search "bbdb-com")
 
+(defun company-bbdb--candidates (arg)
+  (cl-mapcan (lambda (record)
+               (mapcar (lambda (mail) (bbdb-dwim-mail record mail))
+                       (bbdb-record-get-field record 'mail)))
+             (eval '(bbdb-search (bbdb-records) arg nil arg))))
+
 ;;;###autoload
 (defun company-bbdb (command &optional arg &rest ignore)
   "`company-mode' completion back-end for `bbdb'."
@@ -38,10 +44,7 @@
                  (looking-back "^\\(To\\|Cc\\|Bcc\\):.*"
                                (line-beginning-position))
                  (company-grab-symbol)))
-    (candidates (cl-mapcan (lambda (record)
-                             (mapcar (lambda (mail) (bbdb-dwim-mail record mail))
-                                     (bbdb-record-get-field record 'mail)))
-                           (bbdb-search (bbdb-records) arg nil arg)))
+    (candidates (company-bbdb--candidates arg))
     (sorted t)
     (no-cache t)))