Parcourir la source

Merge branch 'maint'

Nicolas Goaziou il y a 12 ans
Parent
commit
7dc2babf29
2 fichiers modifiés avec 14 ajouts et 3 suppressions
  1. 5 2
      lisp/ox.el
  2. 9 1
      testing/lisp/test-ox.el

+ 5 - 2
lisp/ox.el

@@ -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)))

+ 9 - 1
testing/lisp/test-ox.el

@@ -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)))))