Merge branch 'maint'

2014-03-13 15:50:35 +01:00 · 2014-03-13 15:50:35 +01:00 · f4b0fb3dee
parent e2b6c506c2 7f65ba52ee
commit f4b0fb3dee
1 changed files with 1 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -9684,7 +9684,7 @@ active region."
       ;; We're done setting link and desc, clean up
       (if (consp link) (setq cpltxt (car link) link (cdr link)))
       (setq link (or link cpltxt)
-	     desc (or desc cpltxt))
+	     desc (or desc cpltxt ""))
       (cond ((equal desc "NONE") (setq desc nil))
 	     ((string-match org-bracket-link-analytic-regexp desc)
 	      (let ((d0 (match-string 3 desc))