Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-11-05 21:54:37 +01:00
commit 28ccbed523
1 changed files with 2 additions and 1 deletions

View File

@ -10015,7 +10015,8 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
(setq org-stored-links (delq (assoc link org-stored-links)
org-stored-links)))
(if (string-match org-plain-link-re link)
(if (and (string-match org-plain-link-re link)
(not (string-match org-ts-regexp link)))
;; URL-like link, normalize the use of angular brackets.
(setq link (org-remove-angle-brackets link)))