tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
David Maus 2012-03-02 17:30:03 +01:00
parent 77e66226f7 e1ac0cb9cd
commit 144606dbaf
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/org-bbdb.el
View file

@ -124,10 +124,6 @@
(defvar date) ;; dynamically scoped from Org (defvar date) ;; dynamically scoped from Org
(defvar name) ;; dynamically scoped from Org (defvar name) ;; dynamically scoped from Org
;; Support for version 2.35
(eval-after-load 'bbdb
'(defvar org-bbdb-old (fboundp 'bbdb-record-get-field-internal)))
;; Customization ;; Customization
(defgroup org-bbdb-anniversaries nil (defgroup org-bbdb-anniversaries nil
@ -207,7 +203,7 @@ date year)."
;; This is BBDB, we make this link! ;; This is BBDB, we make this link!
(let* ((rec (bbdb-current-record)) (let* ((rec (bbdb-current-record))
(name (bbdb-record-name rec)) (name (bbdb-record-name rec))
(company (if org-bbdb-old (company (if (fboundp 'bbdb-record-getprop)
(bbdb-record-getprop rec 'company) (bbdb-record-getprop rec 'company)
(car (bbdb-record-get-field rec 'organization)))) (car (bbdb-record-get-field rec 'organization))))
(link (org-make-link "bbdb:" name))) (link (org-make-link "bbdb:" name)))
@ -228,10 +224,10 @@ italicized, in all other cases it is left unchanged."
(defun org-bbdb-open (name) (defun org-bbdb-open (name)
"Follow a BBDB link to NAME." "Follow a BBDB link to NAME."
(require 'bbdb) (require 'bbdb-com)
(let ((inhibit-redisplay (not debug-on-error)) (let ((inhibit-redisplay (not debug-on-error))
(bbdb-electric-p nil)) (bbdb-electric-p nil))
(if org-bbdb-old (if (fboundp 'bbdb-name)
(org-bbdb-open-old) (org-bbdb-open-old)
(org-bbdb-open-new)))) (org-bbdb-open-new))))