summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-02-15 23:11:28 +0100
committerBastien Guerry <bzg@altern.org>2013-02-15 23:11:28 +0100
commit996e3b6da32e3896b92f8b3d09e8201d214a3785 (patch)
treea750681142c3dece8b4489674fa928489b47a90a
parent1ee94060bcbfd40ad03a0a32f15692c830629dac (diff)
parent2df6ded853d7da9c0b433bb37c0f82beb3c93f82 (diff)
downloadorg-mode-996e3b6da32e3896b92f8b3d09e8201d214a3785.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/ox.el4
-rw-r--r--testing/lisp/test-ox.el21
2 files changed, 18 insertions, 7 deletions
diff --git a/lisp/ox.el b/lisp/ox.el
index ccff066..afc0b71 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -3746,7 +3746,9 @@ has type \"radio\"."
(let ((path (org-element-property :path link)))
(org-element-map (plist-get info :parse-tree) 'radio-target
(lambda (radio)
- (when (equal (org-element-property :value radio) path) radio))
+ (and (compare-strings
+ (org-element-property :value radio) 0 nil path 0 nil t)
+ radio))
info 'first-match)))
diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el
index acd9a77..34174aa 100644
--- a/testing/lisp/test-ox.el
+++ b/testing/lisp/test-ox.el
@@ -1432,18 +1432,27 @@ Another text. (ref:text)
(ert-deftest test-org-export/resolve-radio-link ()
"Test `org-export-resolve-radio-link' specifications."
;; Standard test.
- (org-test-with-temp-text "<<<radio>>> radio"
- (org-update-radio-target-regexp)
- (should
+ (should
+ (org-test-with-temp-text "<<<radio>>> radio"
+ (org-update-radio-target-regexp)
+ (let* ((tree (org-element-parse-buffer))
+ (info `(:parse-tree ,tree)))
+ (org-export-resolve-radio-link
+ (org-element-map tree 'link 'identity info t)
+ info))))
+ ;; Radio targets are case-insensitive.
+ (should
+ (org-test-with-temp-text "<<<RADIO>>> radio"
+ (org-update-radio-target-regexp)
(let* ((tree (org-element-parse-buffer))
(info `(:parse-tree ,tree)))
(org-export-resolve-radio-link
(org-element-map tree 'link 'identity info t)
info))))
;; Radio target with objects.
- (org-test-with-temp-text "<<<radio \\alpha>>> radio \\alpha"
- (org-update-radio-target-regexp)
- (should
+ (should
+ (org-test-with-temp-text "<<<radio \\alpha>>> radio \\alpha"
+ (org-update-radio-target-regexp)
(let* ((tree (org-element-parse-buffer))
(info `(:parse-tree ,tree)))
(org-export-resolve-radio-link