mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-10 10:05:30 +02:00
parent a427dd0f3b 7204ba0e46
commit 181df8493e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org.el
View File

@ -5714,7 +5714,8 @@ This should be called after the variable `org-link-types' has changed."
"\\([^" org-non-link-chars " ]" "\\([^" org-non-link-chars " ]"
"[^\t\n\r]*\\)") "[^\t\n\r]*\\)")
org-angle-link-re org-angle-link-re
(format "<%s:\\(\n?\\(?:[^>\n]+\n?\\)*\\)>" types-re) (format "<%s:\\([^>\n]*\\(?:\n[ \t]*[^> \t\n][^>\n]*\\)*\\)>"
types-re)
org-plain-link-re org-plain-link-re
(concat (concat
"\\<" types-re ":" "\\<" types-re ":"