From 0c5f6c6c6383c7be7fe08ae76c546d4b95146c69 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 15 Jun 2019 01:37:27 +0200 Subject: [PATCH 1/2] Fix doc of srecompile-compile-split-code (Bug#36200) * lisp/cedet/srecode/compile.el (srecode-compile-split-code): Remove leftover text from docstring. --- lisp/cedet/srecode/compile.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index a19df179013..d2e2807b248 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -398,8 +398,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) From 7a8f22b00484e2c1a28b48767b8562c6b6e89e06 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 15 Jun 2019 05:29:03 +0200 Subject: [PATCH 2/2] * test/lisp/url/url-file-tests.el (url-file): Use file:///, not file://. --- test/lisp/url/url-file-tests.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)))