[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 30e3e58 5/6: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 30e3e58 5/6: Merge from origin/emacs-26 |
Date: |
Sat, 15 Jun 2019 12:50:46 -0400 (EDT) |
branch: master
commit 30e3e58c1b939376a984a19dcbfbd02bcc0b478a
Merge: 6436682 7a8f22b
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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)
---
lisp/cedet/srecode/compile.el | 3 +--
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 834cbff..80b267b 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 45af1bb..84b7c3a 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)))
- [Emacs-diffs] master updated (ca0b4ed -> 402113d), Glenn Morris, 2019/06/15
- [Emacs-diffs] master 6436682 4/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/15
- [Emacs-diffs] master cd406b9 2/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/15
- [Emacs-diffs] master 30e3e58 5/6: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master f6a47c8 3/6: Merge from origin/emacs-26, Glenn Morris, 2019/06/15
- [Emacs-diffs] master 402113d 6/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/15
- [Emacs-diffs] master 689e7c0 1/6: Merge from origin/emacs-26, Glenn Morris, 2019/06/15