From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Liu Newsgroups: gmane.emacs.bugs Subject: bug#17549: 24.4.50; regression: url-insert-file-contents Date: Thu, 26 Jun 2014 08:19:49 +0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1403742084 8349 80.91.229.3 (26 Jun 2014 00:21:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Jun 2014 00:21:24 +0000 (UTC) Cc: 17549@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jun 26 02:21:18 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WzxRF-0002wR-VL for geb-bug-gnu-emacs@m.gmane.org; Thu, 26 Jun 2014 02:21:18 +0200 Original-Received: from localhost ([::1]:41670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzxRF-0000Ox-I9 for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 Jun 2014 20:21:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzxR7-0000Nf-1d for bug-gnu-emacs@gnu.org; Wed, 25 Jun 2014 20:21:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzxR1-0006Rv-5e for bug-gnu-emacs@gnu.org; Wed, 25 Jun 2014 20:21:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41548) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzxR1-0006Rq-2b for bug-gnu-emacs@gnu.org; Wed, 25 Jun 2014 20:21:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WzxR0-000683-Hr for bug-gnu-emacs@gnu.org; Wed, 25 Jun 2014 20:21:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Leo Liu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 26 Jun 2014 00:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17549 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17549-submit@debbugs.gnu.org id=B17549.140374200423439 (code B ref 17549); Thu, 26 Jun 2014 00:21:02 +0000 Original-Received: (at 17549) by debbugs.gnu.org; 26 Jun 2014 00:20:04 +0000 Original-Received: from localhost ([127.0.0.1]:60931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WzxQ2-00065s-V7 for submit@debbugs.gnu.org; Wed, 25 Jun 2014 20:20:04 -0400 Original-Received: from mail-pd0-f177.google.com ([209.85.192.177]:44888) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WzxQ0-00065G-3n for 17549@debbugs.gnu.org; Wed, 25 Jun 2014 20:20:00 -0400 Original-Received: by mail-pd0-f177.google.com with SMTP id y10so2258999pdj.8 for <17549@debbugs.gnu.org>; Wed, 25 Jun 2014 17:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:references:face:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=HLytOQ3+51/BJBBSwTknzK+J8kv4YZXGE6b6hygBkhw=; b=uD44o19t5iTBN4Q9BUITSlf2r4aorkf3wp5AD6NaLCizEoTEIpxuKNZhN+xIH5pAgD o4tXUMp85NRz3C/xykTX84DYHVqzLHWKpMks1xrkzmCgFCmoJFLahhOG+ZAcyaoAgaib R+iIxQ1MRhhqQ6EE1lp/5271Xl1SchTtN5sJwkhNVu1/iYq7rtfccjnXPDqFdoCwtE2N B4lRMvwGFKzc6fKIdSzSPAzPpp5oSQU8hZtPHaG/9ksJfBzNblr2jNthC6rtO1GBDnFt dKOHtpjhM97gMtDYbyhA0RneZwRQA1EsLEQ4zkkf/W25v1t8ySARc63wI/cqbh2Bfh04 mgAg== X-Received: by 10.69.3.196 with SMTP id by4mr9687195pbd.63.1403741993733; Wed, 25 Jun 2014 17:19:53 -0700 (PDT) Original-Received: from fortuna ([221.222.155.37]) by mx.google.com with ESMTPSA id is5sm7064585pbb.8.2014.06.25.17.19.51 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 25 Jun 2014 17:19:53 -0700 (PDT) Face: iVBORw0KGgoAAAANSUhEUgAAACkAAAApAQAAAACAGz1bAAABKElEQVQYlWNg3NIt5FDPUPt7 4+X79Qyucz5/ugik+L2PBgKpyphaIK921q23QDnG0NBQoMr/vaWl9f8ZLL78uPv5PwN7RETfzXoG jhmFz27XM0RXmpuY/WfY+fv0Mc56BvFybfXA/wwL5t/wF61n2PU59axXPcOVzbmSW/8zrNt1benC /ww70hqUU/4zKCtrT9jwn8FhwynbufUMendE2aLqGRpdX9al1zM8eh17lKeeQcTMrdD5P8P3j/YT Q/8zXHSb7p1Qz/C4OM2JuZ7hgtI7K6AjqsMnf8j4z8C6xG1tw3+GqpqvsVn/GTzmpD9j/8/wP/oZ S/l/Bka+QO/g/wy15ueeFQL9N1O8mPU/g+umV3t1gdT0/1bTgHLqYVeXAlWKpMWt+w8Az82C9nHf X0cAAAAASUVORK5CYII= In-Reply-To: (Leo Liu's message of "Wed, 25 Jun 2014 08:58:49 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (CentOS 6.5) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:90822 Archived-At: On 2014-06-25 08:58 +0800, Leo Liu wrote: > The patch introduces a compiler warning on url-http-codes. How best to > suppress it? I'd be very happy if this bug can be fixed for the next release. Any comments on the proposed patch? Thanks, Leo === modified file 'lisp/url/url-handlers.el' --- lisp/url/url-handlers.el 2014-05-12 06:59:30 +0000 +++ lisp/url/url-handlers.el 2014-06-26 00:18:44 +0000 @@ -33,7 +33,6 @@ (autoload 'url-expand-file-name "url-expand" "Convert url to a fully specified url, and canonicalize it.") (autoload 'mm-dissect-buffer "mm-decode" "Dissect the current buffer and return a list of MIME handles.") (autoload 'url-scheme-get-property "url-methods" "Get property of a URL SCHEME.") -(autoload 'url-http-parse-response "url-http" "Parse just the response code.") ;; Always used after mm-dissect-buffer and defined in the same file. (declare-function mm-save-part-to-file "mm-decode" (handle file)) @@ -308,17 +307,19 @@ (insert data)) (list (length data) charset))) +(defconst url-http-codes) + ;;;###autoload (defun url-insert-file-contents (url &optional visit beg end replace) (let ((buffer (url-retrieve-synchronously url))) (unless buffer (signal 'file-error (list url "No Data"))) (with-current-buffer buffer - (let ((response (url-http-parse-response))) - (if (and (>= response 200) (< response 300)) - (goto-char (point-min)) - (let ((desc (buffer-substring-no-properties (1+ (point)) - (line-end-position)))) + (when (bound-and-true-p url-http-response-status) + (unless (and (>= url-http-response-status 200) + (< url-http-response-status 300)) + (let ((desc (nth 2 (assq url-http-response-status url-http-codes)))) (kill-buffer buffer) + ;; Signal file-error per http://debbugs.gnu.org/16733. (signal 'file-error (list url desc)))))) (if visit (setq buffer-file-name url)) (save-excursion @@ -333,6 +334,7 @@ ;; usual heuristic/rules that we apply to files. (decode-coding-inserted-region start (point) url visit beg end replace)) (list url (car size-and-charset)))))) + (put 'insert-file-contents 'url-file-handlers 'url-insert-file-contents) (defun url-file-name-completion (url directory &optional predicate) === modified file 'lisp/url/url-http.el' --- lisp/url/url-http.el 2014-03-29 00:55:44 +0000 +++ lisp/url/url-http.el 2014-06-25 00:23:24 +0000 @@ -48,7 +48,6 @@ (defvar url-http-response-version) (defvar url-http-target-url) (defvar url-http-transfer-encoding) -(defvar url-http-end-of-headers) (defvar url-show-status) (require 'url-gw)