Re: Free variable warning about bbdb-version (bug#19678)

[Thomas Fitzsimmons <fitzsim@fitzsim.org>]

[-- Attachment #1: Type: text/plain, Size: 1398 bytes --]

"Roland Winkler" <winkler@gnu.org> writes:

>> > I guess I would not try to be compatible with both versions.
>> 
>> Do you see any harm in being compatible with both versions?  The
>> patch is already written and tested, so I figure I might as well
>> push it.
>
> No, I do not see any (direct) harm.  Merely, I find that such things
> can significantly decrease readability of the code and thus make
> maintanence more difficult.  (Yet I do not know how intensely the
> code you talk about is linked to BBDB.  With just a few function
> calls from BBDB there should not be too much a problem.)

The patch isn't too bad (see attached), but the version check is ugly.
I'm trying to make the 2.x to 3.x transition as smooth as possible for
EUDC users.

I agree that it would nice to be able to avoid this type of check.
There are lots of references to BBDB throughout Emacs that might have
version dependencies though.  That's why, once the copyrights are clear,
I'd like to see BBDB bundled in Emacs, rather than added to GNU ELPA.
Is that the plan?  Are the Emacs maintainers on board with bundling?

> Also, features in BBDB 3 have been significantly expanded.  I do not
> know either whether your code might benefit from that.

For now, I'm just trying to maintain status quo for eudcb-bbdb.el.
If/when your BBDB version is bundled it'll be easier to take advantage
of the new features.

Thomas

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: bbdb-version-check.patch --]
[-- Type: text/x-patch, Size: 2005 bytes --]

diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 5be2bec..bd5d453 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -42,6 +42,24 @@ (require 'bbdb-com nil t)
 (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)))))
+      'mail
+    field-symbol))
+
 (defvar eudc-bbdb-attributes-translation-alist
   '((name . lastname)
     (email . net)
@@ -85,7 +103,9 @@ (defun eudc-bbdb-filter-non-matching-record (record)
                    (progn
                      (setq bbdb-val
                            (eval (list (intern (concat "bbdb-record-"
-                                                       (symbol-name attr)))
+                                                       (symbol-name
+                                                        (eudc-bbdb-field
+                                                         attr))))
                                        'record)))
                      (if (listp bbdb-val)
                          (if eudc-bbdb-enable-substring-matches
@@ -168,7 +188,7 @@ (defun eudc-bbdb-format-record-as-result (record)
 	(setq val (eval
 		   (list (intern
 			  (concat "bbdb-record-"
-				  (symbol-name attr)))
+				  (symbol-name (eudc-bbdb-field attr))))
 			 'record))))
        (t
 	(error "Unknown BBDB attribute")))