summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-01-01 14:27:07 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2010-01-01 14:27:07 +0100
commit8f17ffae3706e546c909bfa0643c7626bb06c258 (patch)
tree52322701d274681b5863e795d5731ad2c07139f2
parent70d6341f2e4cec845d6ff2925f8b6c73dfddffa7 (diff)
downloadorg-mode-8f17ffae3706e546c909bfa0643c7626bb06c258.tar.gz
Fix export bug with radio links matching inside <<target>>
-rwxr-xr-xlisp/ChangeLog3
-rw-r--r--lisp/org-exp.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cd5e12..4e29a2f 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2010-01-01 Carsten Dominik <carsten.dominik@gmail.com>
+ * org-exp.el (org-export-mark-radio-links): Don't match inside
+ <<target>>.
+
* org.el (org-format-latex-header-extra): New variable.
(org-format-latex): Set org-format-latex-header-extra from
in-buffer stuff.
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index e8eb91f..615819c 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1902,7 +1902,8 @@ When it is nil, all comments will be removed."
(unless
(save-match-data
(or (org-in-regexp org-bracket-link-regexp)
- (org-in-regexp org-plain-link-re)))
+ (org-in-regexp org-plain-link-re)
+ (org-in-regexp "<<[^<>]+>>")))
(org-if-unprotected
(replace-match "\\1[[\\2]]")))))))