diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-08-10 10:04:09 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-08-10 10:04:09 +0200 |
| commit | 7204ba0e4616714d22f04af62ee8e375275f1353 (patch) | |
| tree | dd206165b0a4cf806f70a9211fb44fc9e52e6e20 | |
| parent | 8d2c6af7ed9b0be1655d4688e19a166c8bfddcfa (diff) | |
| download | org-mode-7204ba0e4616714d22f04af62ee8e375275f1353.tar.gz | |
Fix infloop due to wrong angle link regexp
* lisp/org.el (org-make-link-regexps): Fix infloop.
Reported-by: Gregor Zattler <telegraph@gmx.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/99779>
| -rwxr-xr-x | lisp/org.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el index 8966a89..bc3945c 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -5714,7 +5714,8 @@ This should be called after the variable `org-link-types' has changed." "\\([^" org-non-link-chars " ]" "[^\t\n\r]*\\)") 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 (concat "\\<" types-re ":" |