[elpa] externals/company-ebdb a70f4bc 7/9: [company-ebdb] Only return record addresses that actually match

[Stefan Monnier]

branch: externals/company-ebdb
commit a70f4bc7ed95f5806ecdaf893c2c4185449486b0
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    [company-ebdb] Only return record addresses that actually match
    
    * packages/company-ebdb/company-ebdb.el (company-ebdb--candidates):
      Previously was returning all the mail addresses of matching records.
      Now only return actually matching mail addresses.
---
 company-ebdb.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/company-ebdb.el b/company-ebdb.el
index e5df64f..56fc180 100644
--- a/company-ebdb.el
+++ b/company-ebdb.el
@@ -52,8 +52,12 @@
 
 (defun company-ebdb--candidates (arg)
   (cl-mapcan (lambda (record)
-               (mapcar (lambda (mail) (ebdb-dwim-mail record mail))
-                       (ebdb-record-mail record)))
+              (delq nil
+                    (mapcar (lambda (mail)
+                              (let ((dwim (ebdb-dwim-mail record mail)))
+                                (when (string-match-p arg dwim)
+                                  dwim)))
+                            (ebdb-record-mail record))))
              (eval '(ebdb-search (ebdb-records) `((ebdb-field-name ,arg)
                                                  (ebdb-field-mail ,arg))))))