summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2018-01-26 09:04:47 -0500
committerNoam Postavsky <npostavs@gmail.com>2018-01-26 19:50:57 -0500
commit81ae9c8c058d17d276a4443f6938aa3b57a40ca4 (patch)
treebaba5090e02046777cb42ec21e64388351e77ab9 /lisp/url
parent5a1ee67ae18bf992a7aa77b1b06cfa85950ba458 (diff)
downloademacs-81ae9c8c058d17d276a4443f6938aa3b57a40ca4.tar.gz
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.
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/url-file.el1
-rw-r--r--lisp/url/url-misc.el1
2 files changed, 2 insertions, 0 deletions
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index f6446c08161..4fac4060237 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -188,6 +188,7 @@ to them."
(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 9a13732b7a2..e794786f3ad 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -99,6 +99,7 @@
(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"