procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-26

Browse source 
7a8f22b * test/lisp/url/url-file-tests.el (url-file): Use file:///, n...
0c5f6c6 Fix doc of srecompile-compile-split-code (Bug#36200)
This commit is contained in:
Glenn Morris 2019-06-15 09:50:33 -07:00
commit 30e3e58c1b
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/cedet/srecode/compile.el
View file

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

4
test/lisp/url/url-file-tests.el
View file

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