From 69e8cb964d189ab329c0fd1e3a837e92f5d24591 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 21 Nov 2017 19:50:29 -0500 Subject: [PATCH] EUDC: Port eudc-export.el to BBDB >= 3 * lisp/net/eudc-export.el (eudc-create-bbdb-record): Only support BBDB >= 3 arguments to `bbdb-create-internal' call. (eudc-bbdbify-phone): Only call BBDB >= 3 bbdb-parse-phone function. --- lisp/net/eudc-export.el | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index 77f6ddf0eda..ab3bc06ec92 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -98,16 +98,12 @@ If SILENT is non-nil then the created BBDB record is not displayed." (setq bbdb-notes (delq nil bbdb-notes)) (setq bbdb-record (bbdb-create-internal bbdb-name - ,@(when (eudc--using-bbdb-3-or-newer-p) - '(nil - nil)) + nil + nil bbdb-company bbdb-net - ,@(if (eudc--using-bbdb-3-or-newer-p) - '(bbdb-phones - bbdb-address) - '(bbdb-address - bbdb-phones)) + bbdb-phones + bbdb-address bbdb-notes)) (or silent (bbdb-display-records (list bbdb-record)))))) @@ -195,9 +191,7 @@ LOCATION is used as the phone location for BBDB." ((stringp phone) (let (phone-list) (condition-case err - (setq phone-list (if (eudc--using-bbdb-3-or-newer-p) - (bbdb-parse-phone phone) - (bbdb-parse-phone-number phone))) + (setq phone-list (bbdb-parse-phone phone)) (error (if (string= "phone number unparsable." (cadr err)) (if (not (y-or-n-p -- 2.39.5