diff options
| author | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2015-11-22 17:30:50 -0500 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2015-11-22 20:56:22 -0500 |
| commit | 43d2e55fc17336b33a1581adf60179ff07ad580c (patch) | |
| tree | 9c99dd014cc974ca3d2032656dee12a5ad92e63d /lisp/net/eudcb-bbdb.el | |
| parent | 40ed767ba0a35dbaeee6bdbd85a108d88a982b1a (diff) | |
| download | emacs-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/eudcb-bbdb.el')
| -rw-r--r-- | lisp/net/eudcb-bbdb.el | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index 0545304b4a3..1972fc1939a 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el @@ -42,21 +42,13 @@ (defvar eudc-bbdb-current-query nil) (defvar eudc-bbdb-current-return-attributes nil) -(defvar bbdb-version) - (defun eudc-bbdb-field (field-symbol) "Convert FIELD-SYMBOL so that it is recognized by the current BBDB version. BBDB < 3 used `net'; BBDB >= 3 uses `mail'." ;; This just-in-time translation permits upgrading from BBDB 2 to ;; BBDB 3 without restarting Emacs. (if (and (eq field-symbol 'net) - (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))))) + (eudc--using-bbdb-3-or-newer-p)) 'mail field-symbol)) |