Merge branch 'maint'

testing/lisp/test-org-element.el

@@ -1652,14 +1652,6 @@ e^{i\\pi}+1=0
 	 :path
 	 (org-element-map (org-element-parse-buffer) 'link
 	   #'identity nil t))))))
-  ;; ... id link.
-  (should
-   (equal
-    "id"
-    (org-test-with-temp-text "[[id:aaaa]]"
-      (org-element-property
-       :type
-       (org-element-map (org-element-parse-buffer) 'link 'identity nil t)))))
   ;; ... custom-id link.
   (should
    (equal

testing/lisp/test-org-pcomplete.el

@@ -43,17 +43,19 @@
 (ert-deftest test-org-pcomplete/keyword ()
   "Test keyword and block completion."
   (should
-   (equal
+   (string-prefix-p
     "#+startup: "
     (org-test-with-temp-text "#+start<point>"
       (pcomplete)
-      (buffer-string))))
+      (buffer-string))
+    t))
   (should
-   (equal
+   (string-prefix-p
     "#+begin_center"
     (org-test-with-temp-text "#+begin_ce<point>"
       (pcomplete)
-      (buffer-string)))))
+      (buffer-string))
+    t)))
 
 (provide 'test-org-pcomplete)
 ;;; test-org-pcomplete.el ends here

testing/lisp/test-ox.el

@@ -3310,8 +3310,9 @@ Another text. (ref:text)
   "Test `org-export-file-uri' specifications."
   ;; Preserve relative filenames.
   (should (equal "relative.org" (org-export-file-uri "relative.org")))
-  ;; Local files start with "file:///"
-  (should (equal "file:///local.org" (org-export-file-uri "/local.org")))
+  ;; Local files start with "file://"
+  (should (equal (concat "file://" (expand-file-name "/local.org"))
+		 (org-export-file-uri "/local.org")))
   ;; Remote files start with "file://"
   (should (equal "file://myself@some.where:papers/last.pdf"
 		 (org-export-file-uri "/myself@some.where:papers/last.pdf")))