* bug#30258: 26.0.90; url-file and url-data don't load mm-misc
@ 2018-01-26 13:40 Noam Postavsky
2018-01-26 14:08 ` Noam Postavsky
0 siblings, 1 reply; 3+ messages in thread
From: Noam Postavsky @ 2018-01-26 13:40 UTC (permalink / raw)
To: 30258
emacs -Q
(url-data (url-generic-parse-url "data:;,A-brief-note"))
gives
Debugger entered--Lisp error: (void-function mm-disable-multibyte)
mm-disable-multibyte()
url-data(#s(url :type "data" :user nil :password nil :host nil :portspec nil :filename ";,A-brief-note" :target nil :attributes nil :fullness nil :silent nil :use-cookies t :asynchronous t))
eval((url-data (url-generic-parse-url "data:;,A-brief-note")) nil)
Similarly,
(url-file (url-generic-parse-url "file:///dev/null") #'ignore nil)
Debugger entered--Lisp error: (void-function mm-disable-multibyte)
mm-disable-multibyte()
url-file(#s(url :type "file" :user nil :password nil :host "" :portspec nil :filename "/dev/null" :target nil :attributes nil :fullness t :silent nil :use-cookies t :asynchronous t) ignore nil)
eval((url-file (url-generic-parse-url "file:///dev/null") (function ignore) nil) nil)
This does not occur with Emacs 25. Will send patch when I have the bug number.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#30258: 26.0.90; url-file and url-data don't load mm-misc
2018-01-26 13:40 bug#30258: 26.0.90; url-file and url-data don't load mm-misc Noam Postavsky
@ 2018-01-26 14:08 ` Noam Postavsky
2018-01-26 18:54 ` Eli Zaretskii
0 siblings, 1 reply; 3+ messages in thread
From: Noam Postavsky @ 2018-01-26 14:08 UTC (permalink / raw)
To: 30258
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
tags 30258 + patch
quit
Noam Postavsky <npostavs@users.sourceforge.net> writes:
> This does not occur with Emacs 25. Will send patch when I have the bug number.
Here is the patch, should be obviously safe enough for emacs-26, so I'll
push there in a day or two.
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 5800 bytes --]
From 2ae7173c4a3800dbecef85b0502d4ac4d44778f2 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Fri, 26 Jan 2018 09:04:47 -0500
Subject: [PATCH] Load mm-util as needed for url-file and url-data (Bug#30258)
* lisp/url/url-file.el (url-file):
* lisp/url/url-misc.el (url-data): Require `mm-util' before calling
`mm-disable-multibyte'.
* test/lisp/url/url-file-resources/file.txt:
* test/lisp/url/url-file-tests.el:
* test/lisp/url/url-misc-tests.el: New tests.
---
lisp/url/url-file.el | 1 +
lisp/url/url-misc.el | 1 +
test/lisp/url/url-file-resources/file.txt | 1 +
test/lisp/url/url-file-tests.el | 50 +++++++++++++++++++++++++++++++
test/lisp/url/url-misc-tests.el | 41 +++++++++++++++++++++++++
5 files changed, 94 insertions(+)
create mode 100644 test/lisp/url/url-file-resources/file.txt
create mode 100644 test/lisp/url/url-file-tests.el
create mode 100644 test/lisp/url/url-misc-tests.el
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index f6446c0816..4fac406023 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -188,6 +188,7 @@ url-file
(url-find-file-dired filename)
(with-current-buffer
(setq buffer (generate-new-buffer " *url-file*"))
+ (require 'mm-util)
(mm-disable-multibyte)
(setq url-current-object url)
(insert "Content-type: " (or content-type "application/octet-stream") "\n")
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index 9a13732b7a..e794786f3a 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -99,6 +99,7 @@ url-data
(eq ?\; (aref mediatype 0)))
(setq mediatype (concat "text/plain" mediatype))))
(set-buffer (generate-new-buffer " *url-data*"))
+ (require 'mm-util)
(mm-disable-multibyte)
(insert (format "Content-Length: %d\n" (length data))
"Content-Type: " mediatype "\n"
diff --git a/test/lisp/url/url-file-resources/file.txt b/test/lisp/url/url-file-resources/file.txt
new file mode 100644
index 0000000000..b0b4e38e5f
--- /dev/null
+++ b/test/lisp/url/url-file-resources/file.txt
@@ -0,0 +1 @@
+Some file data
diff --git a/test/lisp/url/url-file-tests.el b/test/lisp/url/url-file-tests.el
new file mode 100644
index 0000000000..969bca7f8d
--- /dev/null
+++ b/test/lisp/url/url-file-tests.el
@@ -0,0 +1,50 @@
+;;; url-file-tests.el --- Test suite for url-file. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2018 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'url-file)
+(require 'ert)
+
+(defconst url-file-tests-data-directory
+ (expand-file-name "lisp/url/url-file-resources"
+ (or (getenv "EMACS_TEST_DIRECTORY")
+ (expand-file-name "../../.."
+ (or load-file-name
+ buffer-file-name))))
+ "Directory for url-file test files.")
+
+(ert-deftest url-file ()
+ "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))
+ #'ignore nil)
+ (prog1 (buffer-substring (point) (point-max))
+ (kill-buffer)))
+ (with-temp-buffer
+ (insert-file-contents-literally file)
+ (buffer-string))))))
+
+(provide 'url-file-tests)
+
+;;; url-file-tests.el ends here
diff --git a/test/lisp/url/url-misc-tests.el b/test/lisp/url/url-misc-tests.el
new file mode 100644
index 0000000000..fec2609bb7
--- /dev/null
+++ b/test/lisp/url/url-misc-tests.el
@@ -0,0 +1,41 @@
+;;; url-misc-tests.el --- Test suite for url-misc. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2018 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'url-misc)
+(require 'ert)
+
+(ert-deftest url-misc-data ()
+ "Test reading data: URL."
+ (should (equal
+ (with-current-buffer
+ (url-data (url-generic-parse-url "data:;,some%20text"))
+ (goto-char (point-min))
+ (forward-paragraph)
+ (forward-line)
+ (prog1 (buffer-substring (point) (point-max))
+ (kill-buffer)))
+ "some text")))
+
+(provide 'url-misc-tests)
+
+;;; url-misc-tests.el ends here
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#30258: 26.0.90; url-file and url-data don't load mm-misc
2018-01-26 14:08 ` Noam Postavsky
@ 2018-01-26 18:54 ` Eli Zaretskii
0 siblings, 0 replies; 3+ messages in thread
From: Eli Zaretskii @ 2018-01-26 18:54 UTC (permalink / raw)
To: Noam Postavsky; +Cc: 30258
> From: Noam Postavsky <npostavs@users.sourceforge.net>
> Date: Fri, 26 Jan 2018 09:08:34 -0500
>
> Here is the patch, should be obviously safe enough for emacs-26, so I'll
> push there in a day or two.
Please do, and thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-26 18:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-26 13:40 bug#30258: 26.0.90; url-file and url-data don't load mm-misc Noam Postavsky
2018-01-26 14:08 ` Noam Postavsky
2018-01-26 18:54 ` Eli Zaretskii
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.