Merge branch 'master' of orgmode.org:org-mode

lisp/org.el

@@ -6179,17 +6179,13 @@ targets."
 The regular expression finds the targets also if there is a line break
 between words."
   (and targets
-       (concat
+       (concat "\\("
-	"\\_<\\("
+	       (mapconcat
-	(mapconcat
+		(lambda (x)
-	 (lambda (x)
+		  (replace-regexp-in-string " +" "\\s-+" (regexp-quote x) t t))
-	   (setq x (regexp-quote x))
+		targets
-	   (while (string-match " +" x)
+		"\\|")
-	     (setq x (replace-match "\\s-+" t t x)))
+	       "\\)")))
-	   x)
-	 targets
-	 "\\|")
-	"\\)\\_>")))
 
 (defun org-activate-tags (limit)
   (if (re-search-forward (org-re "^\\*+.*[ \t]\\(:[[:alnum:]_@#%:]+:\\)[ \r\n]") limit t)

lisp/ox-publish.el

@@ -1169,7 +1169,9 @@ the file including them will be republished as well."
 	  (let* ((element (org-element-at-point))
 		 (included-file
 		  (and (eq (org-element-type element) 'keyword)
-		       (org-string-nw-p (org-element-property :value element)))))
+		       (string-match "^\\(\".+?\"\\|\\S-+\\)"
+				     (org-element-property :value element))
+		       (org-remove-double-quotes (match-string 1)))))
 	    (when included-file
 	      (add-to-list 'included-files-ctime
 			   (org-publish-cache-ctime-of-src

testing/lisp/test-ox.el

@@ -2042,6 +2042,15 @@ Another text. (ref:text)
        (org-export-resolve-radio-link
 	(org-element-map tree 'link 'identity info t)
 	info))))
+  ;; Radio link next to an apostrophe.
+  (should
+   (org-test-with-temp-text "<<<radio>>> radio's"
+     (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))))
   ;; Multiple radio targets.
   (should
    (equal '("radio1" "radio2")