summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-03-13 15:50:35 +0100
committerBastien Guerry <bzg@altern.org>2014-03-13 15:50:35 +0100
commitf4b0fb3dee410206cf36eaa2199b8cabe6c86fe7 (patch)
tree21e8fe6089b61b05540a24ac248858e0790e1003
parente2b6c506c28540943c9802a46500c940baa793be (diff)
parent7f65ba52eed64a4402b39f46bc852c6fb1291884 (diff)
downloadorg-mode-f4b0fb3dee410206cf36eaa2199b8cabe6c86fe7.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 1863c00..10f41ec 100644
--- 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))