Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master

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

diff --git a/packages/company/company-bbdb.el b/packages/company/company-bbdb.el
index 8e4705f73910437c958d04e50d5a659c42def25b..acdd30ac14922aeb683bb1e14984cd3202736c06 100644 (file)
--- a/packages/company/company-bbdb.el
+++ b/packages/company/company-bbdb.el
@@ -20,7 +20,7 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 (require 'company)
-(eval-when-compile (require 'cl))
+(require 'cl-lib)
 
 (declare-function bbdb-record-get-field "bbdb")
 (declare-function bbdb-records "bbdb")
@@ -31,17 +31,17 @@
 (defun company-bbdb (command &optional arg &rest ignore)
   "`company-mode' completion back-end for `bbdb'."
   (interactive (list 'interactive))
-  (case command
+  (cl-case command
     (interactive (company-begin-backend 'company-bbdb))
     (prefix (and (eq major-mode 'message-mode)
                  (featurep 'bbdb-com)
                  (looking-back "^\\(To\\|Cc\\|Bcc\\):.*"
                                (line-beginning-position))
                  (company-grab-symbol)))
-    (candidates (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 (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)))
     (sorted t)
     (no-cache t)))