X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/996fbd2b6a2fa38e14277b98cdcf99faf39a8a5f..c6d53302b114ba50a8e48ce98b906849fded86f4:/company-bbdb.el

diff --git a/company-bbdb.el b/company-bbdb.el
index a134f9036..872e1fcf0 100644
--- a/company-bbdb.el
+++ b/company-bbdb.el
@@ -1,6 +1,6 @@
-;;; company-bbdb.el --- company-mode completion back-end for BBDB in message-mode
+;;; company-bbdb.el --- company-mode completion backend for BBDB in message-mode
 
-;; Copyright (C) 2013-2014  Free Software Foundation, Inc.
+;; Copyright (C) 2013-2014, 2016  Free Software Foundation, Inc.
 
 ;; Author: Jan Tatarik <jan.tatarik@gmail.com>
 
@@ -27,6 +27,10 @@
 (declare-function bbdb-dwim-mail "bbdb-com")
 (declare-function bbdb-search "bbdb-com")
 
+(defgroup company-bbdb nil
+  "Completion backend for BBDB."
+  :group 'company)
+
 (defcustom company-bbdb-modes '(message-mode)
   "Major modes in which `company-bbdb' may complete."
   :type '(repeat (symbol :tag "Major mode"))
@@ -40,13 +44,13 @@
 
 ;;;###autoload
 (defun company-bbdb (command &optional arg &rest ignore)
-  "`company-mode' completion back-end for `bbdb'."
+  "`company-mode' completion backend for BBDB."
   (interactive (list 'interactive))
   (cl-case command
     (interactive (company-begin-backend 'company-bbdb))
     (prefix (and (memq major-mode company-bbdb-modes)
                  (featurep 'bbdb-com)
-                 (looking-back "^\\(To\\|Cc\\|Bcc\\): *\\(.*\\)"
+                 (looking-back "^\\(To\\|Cc\\|Bcc\\): *.*? *\\([^,;]*\\)"
                                (line-beginning-position))
                  (match-string-no-properties 2)))
     (candidates (company-bbdb--candidates arg))