From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#16733: messed up unicode chars in package description Date: Fri, 21 Mar 2014 22:54:23 -0400 Message-ID: References: <7tfvnn7phj.fsf@fencepost.gnu.org> <83zjkm865z.fsf@gnu.org> <838us496xy.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1395456914 18678 80.91.229.3 (22 Mar 2014 02:55:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Mar 2014 02:55:14 +0000 (UTC) Cc: 16733@debbugs.gnu.org To: Juanma Barranquero Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Mar 22 03:55:23 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 1WRC5h-0003ZX-1K for geb-bug-gnu-emacs@m.gmane.org; Sat, 22 Mar 2014 03:55:21 +0100 Original-Received: from localhost ([::1]:55489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRC5g-0007y7-NS for geb-bug-gnu-emacs@m.gmane.org; Fri, 21 Mar 2014 22:55:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRC5W-0007hn-Ie for bug-gnu-emacs@gnu.org; Fri, 21 Mar 2014 22:55:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WRC5P-0004bd-8f for bug-gnu-emacs@gnu.org; Fri, 21 Mar 2014 22:55:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRC5P-0004bD-5L for bug-gnu-emacs@gnu.org; Fri, 21 Mar 2014 22:55:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WRC5O-0002C9-9J for bug-gnu-emacs@gnu.org; Fri, 21 Mar 2014 22:55:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 22 Mar 2014 02:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16733 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 16733-submit@debbugs.gnu.org id=B16733.13954568678377 (code B ref 16733); Sat, 22 Mar 2014 02:55:02 +0000 Original-Received: (at 16733) by debbugs.gnu.org; 22 Mar 2014 02:54:27 +0000 Original-Received: from localhost ([127.0.0.1]:44066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WRC4n-0002B2-UJ for submit@debbugs.gnu.org; Fri, 21 Mar 2014 22:54:26 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:49056) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WRC4l-0002Au-R7 for 16733@debbugs.gnu.org; Fri, 21 Mar 2014 22:54:24 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFHO+KKg/2dsb2JhbABEuzWDWRdzgh8BBVYjEAsOJhIUGA0kiCTBLZEKA5JbA5IcgV6DEw X-IPAS-Result: Av8EABK/CFHO+KKg/2dsb2JhbABEuzWDWRdzgh8BBVYjEAsOJhIUGA0kiCTBLZEKA5JbA5IcgV6DEw X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="52939840" Original-Received: from 206-248-162-160.dsl.teksavvy.com (HELO ceviche.home) ([206.248.162.160]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 21 Mar 2014 22:54:23 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 11DE1660FE; Fri, 21 Mar 2014 22:54:23 -0400 (EDT) In-Reply-To: (Juanma Barranquero's message of "Sat, 22 Mar 2014 02:33:21 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) 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:87134 Archived-At: > --- lisp/url/url-handlers.el 2014-01-01 07:43:34 +0000 > +++ lisp/url/url-handlers.el 2014-03-22 01:16:06 +0000 > @@ -290,11 +290,14 @@ > (insert data)) > (list (length data) charset))) > -;;;###autoload > -(defun url-insert-file-contents (url &optional visit beg end replace) > +(defun url-insert-file-contents-internal (check url &optional visit > beg end replace) > (let ((buffer (url-retrieve-synchronously url))) > - (if (not buffer) > - (error "Opening input file: No such file or directory, %s" url)) > + (when check > + (condition-case err > + (funcall check buffer url visit beg end replace) > + (error > + (when buffer (kill-buffer)) > + (signal (car err) (cdr err))))) > (if visit (setq buffer-file-name url)) > (save-excursion > (let* ((start (point)) Let's not call it "-internal" since it should be "always" preferred over the other one. Also, I see no need to pass "url visit beg end replace" to "check" (if that function needs it, the caller can provide it). Also, how 'bout only calling that `check' function in case of a problem? Stefan