summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-07-06 12:51:30 -0700
committerGlenn Morris <rgm@gnu.org>2019-07-06 12:51:30 -0700
commit16a8a7695f6696e0f637c71bd1a0ba9442d4c5f5 (patch)
treebeff7d5c18968279c63ea29e4d31e2b7cb863997 /test
parentd07dd64fd0476e0346d2de65b965193703ae6e7a (diff)
parent316f5a3b717d727d46c15da46471e196bfea9a36 (diff)
downloademacs-16a8a7695f6696e0f637c71bd1a0ba9442d4c5f5.tar.gz
Merge from origin/emacs-26
316f5a3 Fix typo in doc string of file-exists-p (bug#36408) bfc7c6e * test/lisp/url/url-file-tests.el (url-file): Fix for POSIX f... 13b95e1 Fix typo in windows.texi 8b775c3 Clarify & update (elisp) Writing Emacs Primitives 7648c12 Clarify a subtle issue in the Internals chapter of lispref
Diffstat (limited to 'test')
-rw-r--r--test/lisp/url/url-file-tests.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/lisp/url/url-file-tests.el b/test/lisp/url/url-file-tests.el
index 84b7c3a70b0..58e0250ba96 100644
--- a/test/lisp/url/url-file-tests.el
+++ b/test/lisp/url/url-file-tests.el
@@ -34,10 +34,11 @@
(ert-deftest url-file ()
"Test reading file via file:/// URL."
- (let ((file (expand-file-name "file.txt" url-file-tests-data-directory)))
+ (let* ((file (expand-file-name "file.txt" url-file-tests-data-directory))
+ (uri-prefix (if (eq (aref file 0) ?/) "file://" "file:///")))
(should (equal
(with-current-buffer
- (url-file (url-generic-parse-url (concat "file:///" file))
+ (url-file (url-generic-parse-url (concat uri-prefix file))
#'ignore nil)
(prog1 (buffer-substring (point) (point-max))
(kill-buffer)))