Merge branch 'maint' of orgmode.org:org-mode into maint

2014-04-29 13:08:10 +02:00 · 2014-04-29 13:08:10 +02:00 · e6918b0bb2
parent 3104f7de7b ea50ad41be
commit e6918b0bb2
1 changed files with 5 additions and 2 deletions
--- 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."