branch: master
commit 534fede7a229311cd2e1d2734725a5a56a149665
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
[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.
---
packages/company-ebdb/company-ebdb.el | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/packages/company-ebdb/company-ebdb.el
b/packages/company-ebdb/company-ebdb.el
index e5df64f..56fc180 100644
--- a/packages/company-ebdb/company-ebdb.el
+++ b/packages/company-ebdb/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))))))