From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#30258: 26.0.90; url-file and url-data don't load mm-misc Date: Fri, 26 Jan 2018 09:08:34 -0500 Message-ID: <878tckn259.fsf@users.sourceforge.net> References: <87d11wn3ga.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1516980621 29758 195.159.176.226 (26 Jan 2018 15:30:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 26 Jan 2018 15:30:21 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.90 (gnu/linux) To: 30258@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 26 16:30:17 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ef5x5-0006V9-9u for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Jan 2018 16:30:03 +0100 Original-Received: from localhost ([::1]:33580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef5z5-0000Gk-FT for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Jan 2018 10:32:07 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef5yr-0000EP-UE for bug-gnu-emacs@gnu.org; Fri, 26 Jan 2018 10:31:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef5yo-0001pH-Ej for bug-gnu-emacs@gnu.org; Fri, 26 Jan 2018 10:31:53 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ef5yo-0001p8-AE for bug-gnu-emacs@gnu.org; Fri, 26 Jan 2018 10:31:50 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ef4gg-0006H0-HS for bug-gnu-emacs@gnu.org; Fri, 26 Jan 2018 09:09:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Jan 2018 14:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30258 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 30258-submit@debbugs.gnu.org id=B30258.151697572724093 (code B ref 30258); Fri, 26 Jan 2018 14:09:02 +0000 Original-Received: (at 30258) by debbugs.gnu.org; 26 Jan 2018 14:08:47 +0000 Original-Received: from localhost ([127.0.0.1]:43242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ef4gQ-0006GR-T8 for submit@debbugs.gnu.org; Fri, 26 Jan 2018 09:08:47 -0500 Original-Received: from mail-io0-f170.google.com ([209.85.223.170]:39530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ef4gN-0006G8-7Y; Fri, 26 Jan 2018 09:08:43 -0500 Original-Received: by mail-io0-f170.google.com with SMTP id b198so544244iof.6; Fri, 26 Jan 2018 06:08:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=SDfG7PSzZ7+l6wvuNNVdSg1INRp6TJNr8Lw8bhsutpw=; b=SlpnIvqrrA23BfrtS7M0veSE52S43ur6jKTw28KSx2OsnOGCfQxspCQa1gds9ObLU0 rhnht+RCysKPZerLq5JqAIWsvx/0cOTtN001AEHP/b+xuFhzkdGVzWdLTN8yF8ktDlGQ Bwd+QLFw1Cf/s0ShsHxaZr5SADU2qrfr1yBmZ37yperawrirroy1OKYezlsDAUig6Roo Oe1RIEBTAtAhFL2OQfQD6wy6dslEdAPUB6fiOTGTYZ8Ue5vBKjaucerRvqRtAV9bP0E3 PqkZlzYL208KD4diE3T5WBvWncfyaNucXY1tUkN22pwj+dRphNb4s3AA12GSUA5MoBZY MnxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=SDfG7PSzZ7+l6wvuNNVdSg1INRp6TJNr8Lw8bhsutpw=; b=j3L72kWgHOBasyTJYSHn5KoHjtwg69/0faSMNzyDvWpuNvoZyRKozOqm27Tpby8RLH KIWxNfMev7nwjoPOx2Kbj+nuG4tpTkJHGjd1exuRRAC2aZGDJvK3HIOhzNcM7KoA97ZR 1slnuWkZcty0gIZ3QWEd0yV+EEJ01CgUKurrRQ6o0ucLUI+nFevR3qTckB+gmN0PTq83 4drbLo5LoMuguJHNe/es2lgPGXF1Z71c1KtBonMm70rAeD6m7+2572W9bD9pskKWI6KY pJLZtM+Ls3pbaW3WmcgEGA6sCrUrLvCIR6u0R90nDd5BIMM0VD2RZVOO5X+RHkV3Bjhe 00Bg== X-Gm-Message-State: AKwxytfGv3uqeL0xvzEH+X5uLMqPmIltbaF0wcQF6yxWfiVVMyl/lNjX e4GBoJGSMveugN0+nkbFIj481w== X-Google-Smtp-Source: AH8x224WIj3NMc+0HYAqilfxpPP/tIApBhuo/20ZNAg8EHtI1SSL6XaZNZPRmqGUe9eCn28xe4V6LA== X-Received: by 10.107.133.163 with SMTP id p35mr16556275ioi.44.1516975717179; Fri, 26 Jan 2018 06:08:37 -0800 (PST) Original-Received: from zebian ([45.2.119.34]) by smtp.googlemail.com with ESMTPSA id e22sm578651ioj.79.2018.01.26.06.08.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2018 06:08:35 -0800 (PST) In-Reply-To: <87d11wn3ga.fsf@users.sourceforge.net> (Noam Postavsky's message of "Fri, 26 Jan 2018 08:40:21 -0500") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:142538 Archived-At: --=-=-= Content-Type: text/plain tags 30258 + patch quit Noam Postavsky 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. --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-Load-mm-util-as-needed-for-url-file-and-url-data-Bug.patch Content-Description: patch >From 2ae7173c4a3800dbecef85b0502d4ac4d44778f2 Mon Sep 17 00:00:00 2001 From: Noam Postavsky 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 . + +;;; 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 . + +;;; 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 --=-=-=--