diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-15 09:50:33 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-15 09:50:33 -0700 |
| commit | 30e3e58c1b939376a984a19dcbfbd02bcc0b478a (patch) | |
| tree | 8e293338a3ed4551a1c41f5f07e6b673a24711b6 | |
| parent | 64366826c7679bad16c0a084f486b333ebd130b6 (diff) | |
| parent | 7a8f22b00484e2c1a28b48767b8562c6b6e89e06 (diff) | |
| download | emacs-30e3e58c1b939376a984a19dcbfbd02bcc0b478a.tar.gz | |
Merge from origin/emacs-26
7a8f22b * test/lisp/url/url-file-tests.el (url-file): Use file:///, n...
0c5f6c6 Fix doc of srecompile-compile-split-code (Bug#36200)
| -rw-r--r-- | lisp/cedet/srecode/compile.el | 3 | ||||
| -rw-r--r-- | test/lisp/url/url-file-tests.el | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index 834cbff6032..80b267b8c23 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -385,8 +385,7 @@ ESCAPE_START and ESCAPE_END are regexps that indicate the beginning escape character, and end escape character pattern for expandable macro names. Optional argument END-NAME specifies the name of a token upon which -parsing should stop. -If END-NAME is specified, and the input string" +parsing should stop." (let* ((what str) (end-token nil) (comp nil) diff --git a/test/lisp/url/url-file-tests.el b/test/lisp/url/url-file-tests.el index 45af1bba95d..84b7c3a70b0 100644 --- a/test/lisp/url/url-file-tests.el +++ b/test/lisp/url/url-file-tests.el @@ -33,11 +33,11 @@ "Directory for url-file test files.") (ert-deftest url-file () - "Test reading file via file:// URL." + "Test reading file via file:/// URL." (let ((file (expand-file-name "file.txt" url-file-tests-data-directory))) (should (equal (with-current-buffer - (url-file (url-generic-parse-url (concat "file://" file)) + (url-file (url-generic-parse-url (concat "file:///" file)) #'ignore nil) (prog1 (buffer-substring (point) (point-max)) (kill-buffer))) |