Browse Source

Merge branch 'maint'

Bastien Guerry 11 years ago
parent
commit
f4b0fb3dee
1 changed files with 1 additions and 1 deletions
  1. 1 1
      lisp/org.el

+ 1 - 1
lisp/org.el

@@ -9684,7 +9684,7 @@ active region."
        ;; We're done setting link and desc, clean up
        ;; We're done setting link and desc, clean up
        (if (consp link) (setq cpltxt (car link) link (cdr link)))
        (if (consp link) (setq cpltxt (car link) link (cdr link)))
        (setq link (or link cpltxt)
        (setq link (or link cpltxt)
-	     desc (or desc cpltxt))
+	     desc (or desc cpltxt ""))
        (cond ((equal desc "NONE") (setq desc nil))
        (cond ((equal desc "NONE") (setq desc nil))
 	     ((string-match org-bracket-link-analytic-regexp desc)
 	     ((string-match org-bracket-link-analytic-regexp desc)
 	      (let ((d0 (match-string 3 desc))
 	      (let ((d0 (match-string 3 desc))