Merge branch 'maint'

2012-02-27 21:32:57 +01:00 · 2012-02-27 21:32:57 +01:00 · ab36517016
parent 8748096674 ddf4f1e7a9
commit ab36517016
1 changed files with 2 additions and 1 deletions
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@ -125,7 +125,8 @@
 (defvar name)   ;; dynamically scoped from Org

 ;; Support for version 2.35
-(defvar org-bbdb-old (fboundp 'bbdb-record-get-field-internal))
+(eval-after-load 'bbdb
+  '(defvar org-bbdb-old (fboundp 'bbdb-record-get-field-internal)))

 ;; Customization