summaryrefslogtreecommitdiff
path: root/lisp/net/eudc.el
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@fitzsim.org>2015-11-22 17:30:50 -0500
committerThomas Fitzsimmons <fitzsim@fitzsim.org>2015-11-22 20:56:22 -0500
commit43d2e55fc17336b33a1581adf60179ff07ad580c (patch)
tree9c99dd014cc974ca3d2032656dee12a5ad92e63d /lisp/net/eudc.el
parent40ed767ba0a35dbaeee6bdbd85a108d88a982b1a (diff)
downloademacs-43d2e55fc17336b33a1581adf60179ff07ad580c.tar.gz
Add BBDB 3 support for EUDC export
* eudc.el: Add bbdb-version defvar. (eudc--using-bbdb-3-or-newer-p): New function. * eudc-export.el (eudc-create-bbdb-record): Add support for bbdb-create-internal argument list changes introduced in BBDB 3. * eudcb-bbdb.el: Remove bbdb-version defvar. (eudc-bbdb-field): Call eudc--using-bbdb-3-or-newer-p. (Bug#21971)
Diffstat (limited to 'lisp/net/eudc.el')
-rw-r--r--lisp/net/eudc.el12
1 files changed, 12 insertions, 0 deletions
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 7280d9d2625..25a26bdf029 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -107,6 +107,18 @@
;; attribute name
(defvar eudc-protocol-has-default-query-attributes nil)
+(defvar bbdb-version)
+
+(defun eudc--using-bbdb-3-or-newer-p ()
+ "Return non-nil if BBDB version is 3 or greater."
+ (or
+ ;; MELPA versions of BBDB may have a bad package version, but
+ ;; they're all version 3 or later.
+ (equal bbdb-version "@PACKAGE_VERSION@")
+ ;; Development versions of BBDB can have the format "X.YZ devo".
+ ;; Split the string just in case.
+ (version<= "3" (car (split-string bbdb-version)))))
+
(defun eudc-plist-member (plist prop)
"Return t if PROP has a value specified in PLIST."
(if (not (= 0 (% (length plist) 2)))