mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-12 16:24:10 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Nicolas Goaziou 2013-05-12 20:45:01 +02:00
commit 7dc2babf29
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ox.el
View File

@ -4079,11 +4079,14 @@ INFO is a plist used as a communication channel.
Return value can be a radio-target object or nil. Assume LINK
has type \"radio\"."
(let ((path (org-element-property :path link)))
(let ((path (replace-regexp-in-string
"[ \r\t\n]+" " " (org-element-property :path link))))
(org-element-map (plist-get info :parse-tree) 'radio-target
(lambda (radio)
(and (eq (compare-strings
(org-element-property :value radio) 0 nil path 0 nil t)
(replace-regexp-in-string
"[ \r\t\n]+" " " (org-element-property :value radio))
nil nil path nil nil t)
t)
radio))
info 'first-match)))

10
testing/lisp/test-ox.el
View File

@ -1719,7 +1719,15 @@ Another text. (ref:text)
(lambda (link)
(org-element-property
:value (org-export-resolve-radio-link link info)))
info))))))
info)))))
;; Radio target is whitespace insensitive.
(should
(org-test-with-temp-text "<<<a radio>>> a\n radio"
(org-update-radio-target-regexp)
(let* ((tree (org-element-parse-buffer))
(info `(:parse-tree ,tree)))
(org-element-map tree 'link
(lambda (link) (org-export-resolve-radio-link link info)) info t)))))