From e1ac0cb9cd6f1f7c0f7de892d5a720dfad27ff68 Mon Sep 17 00:00:00 2001 From: David Maus Date: Fri, 2 Mar 2012 17:28:17 +0100 Subject: [PATCH] org-bbdb: Check for BBDB version depending on available functions * org-bbdb.el (org-bbdb-old): Replace `defvar' after loading 'bbdb to check for old or new version by a check for the required function in `org-bbdb-open' and `org-bbdb-store-link'. (org-bbdb-store-link, org-bbdb-open): Check which version of bbdb is to be used. This is a follow up of ddf4f1e7a95608b2223dee7170ecd4a51788def4. Instead of depending on the loading of bbdb we do a check for the required function in `org-bbdb-open' and `org-bbdb-store-link'. --- lisp/org-bbdb.el | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el index 1162a8dd1..bc5b96f43 100644 --- a/lisp/org-bbdb.el +++ b/lisp/org-bbdb.el @@ -118,10 +118,6 @@ (defvar date) ;; dynamically scoped from Org -;; Support for version 2.35 -(eval-after-load 'bbdb - '(defvar org-bbdb-old (fboundp 'bbdb-record-get-field-internal))) - ;; Customization (defgroup org-bbdb-anniversaries nil @@ -201,7 +197,7 @@ date year)." ;; This is BBDB, we make this link! (let* ((rec (bbdb-current-record)) (name (bbdb-record-name rec)) - (company (if org-bbdb-old + (company (if (fboundp 'bbdb-record-getprop) (bbdb-record-getprop rec 'company) (car (bbdb-record-get-field rec 'organization)))) (link (org-make-link "bbdb:" name))) @@ -222,10 +218,10 @@ italicized, in all other cases it is left unchanged." (defun org-bbdb-open (name) "Follow a BBDB link to NAME." - (require 'bbdb) + (require 'bbdb-com) (let ((inhibit-redisplay (not debug-on-error)) (bbdb-electric-p nil)) - (if org-bbdb-old + (if (fboundp 'bbdb-name) (org-bbdb-open-old) (org-bbdb-open-new)))) -- 2.11.4.GIT