Fix some oddities in Tramp's rsync and smb methods

[gnu-emacs] / lisp / net / eudcb-bbdb.el

diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 0545304b4a3f500a4e1df56256d7775082ae103c..796391be2dec8579aa8e0ef57f31f89096bf1f2b 100644 (file)
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -1,6 +1,6 @@
 ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend
 
-;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2016 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
@@ -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))