summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-04-29 13:08:10 +0200
committerBastien Guerry <bzg@altern.org>2014-04-29 13:08:10 +0200
commite6918b0bb2c981f9ac71accb0ab4a1f116fa2835 (patch)
tree891f8ff3982708bb711e3a12fa9ac6a51c43823d
parent3104f7de7baaf55175cabe077e6abdad72b2a586 (diff)
parentea50ad41bee8a813fd7c172574fd3c600c6b34f0 (diff)
downloadorg-mode-e6918b0bb2c981f9ac71accb0ab4a1f116fa2835.tar.gz
Merge branch 'maint' of orgmode.org:org-mode into maint
-rw-r--r--lisp/org-bbdb.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index b9841a6..cfd5b3b 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -400,8 +400,11 @@ This is used by Org to re-create the anniversary hash table."
(defun org-bbdb-complete-link ()
"Read a bbdb link with name completion."
(require 'bbdb-com)
- (concat "bbdb:"
- (bbdb-record-name (car (bbdb-completing-read-record "Name: ")))))
+ (let ((rec (bbdb-completing-read-record "Name: ")))
+ (concat "bbdb:"
+ (bbdb-record-name (if (listp rec)
+ (car rec)
+ rec)))))
(defun org-bbdb-anniv-export-ical ()
"Extract anniversaries from BBDB and convert them to icalendar format."