From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steve Purcell Newsgroups: gmane.emacs.bugs Subject: bug#20231: 25.0.50; package.el mangles non-ascii content in downloaded archive-contents data Date: Sat, 11 Apr 2015 18:08:16 +0100 Message-ID: <8292DA72-0898-47B2-A1C1-F7D94A52A437@sanityinc.com> References: <6343E9EC-9E23-4D44-9CD1-82C26DB7CDA3@sanityinc.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_B24151CE-33EE-4BF4-9149-6DEAC27047B1" X-Trace: ger.gmane.org 1428772168 16997 80.91.229.3 (11 Apr 2015 17:09:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 11 Apr 2015 17:09:28 +0000 (UTC) To: Stefan Monnier , 20231@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 11 19:09:14 2015 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 1Ygyu9-0000H9-Jk for geb-bug-gnu-emacs@m.gmane.org; Sat, 11 Apr 2015 19:09:13 +0200 Original-Received: from localhost ([::1]:43323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ygyu8-0005Ck-JL for geb-bug-gnu-emacs@m.gmane.org; Sat, 11 Apr 2015 13:09:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ygyu3-0005Cf-KL for bug-gnu-emacs@gnu.org; Sat, 11 Apr 2015 13:09:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ygyty-0003Lf-Lc for bug-gnu-emacs@gnu.org; Sat, 11 Apr 2015 13:09:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ygyty-0003KO-HR for bug-gnu-emacs@gnu.org; Sat, 11 Apr 2015 13:09:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Ygyty-0004su-88 for bug-gnu-emacs@gnu.org; Sat, 11 Apr 2015 13:09:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Steve Purcell Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 11 Apr 2015 17:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20231 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20231-submit@debbugs.gnu.org id=B20231.142877210718722 (code B ref 20231); Sat, 11 Apr 2015 17:09:02 +0000 Original-Received: (at 20231) by debbugs.gnu.org; 11 Apr 2015 17:08:27 +0000 Original-Received: from localhost ([127.0.0.1]:53366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YgytO-0004rt-TZ for submit@debbugs.gnu.org; Sat, 11 Apr 2015 13:08:27 -0400 Original-Received: from purcellpeople.com ([85.214.32.38]:33540 helo=h1189701.stratoserver.net) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YgytL-0004rd-Vw for 20231@debbugs.gnu.org; Sat, 11 Apr 2015 13:08:24 -0400 Original-Received: from [192.168.1.103] (host31-48-107-253.range31-48.btcentralplus.com [31.48.107.253]) by h1189701.stratoserver.net (Postfix) with ESMTPSA id 3B85E82008A; Sat, 11 Apr 2015 19:08:16 +0200 (CEST) In-Reply-To: X-Mailer: Apple Mail (2.2098) 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:101430 Archived-At: --Apple-Mail=_B24151CE-33EE-4BF4-9149-6DEAC27047B1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii The attached patch seems reasonable and works nicely for me. Happy to = modify it if necessary. -Steve --Apple-Mail=_B24151CE-33EE-4BF4-9149-6DEAC27047B1 Content-Disposition: attachment; filename=archive-contents-encoding.patch Content-Type: application/octet-stream; name="archive-contents-encoding.patch" Content-Transfer-Encoding: 7bit 4dc1966abf44aff8baab2bf20a395260ea640428 HEAD master Author: Steve Purcell Date: Sat Apr 11 18:01:06 2015 +0100 Assume package archive-contents are UTF8-encoded * lisp/emacs-lisp/package.el (package--read-archive-file): Set `coding-system-for-read' explicitly to 'utf-8 when reading the downloaded and cached archive-contents files, so that non-ASCII characters in package descriptions are displayed correctly in the `list-packages' menu. (Bug #20231) 1 file changed, 7 insertions(+), 6 deletions(-) lisp/emacs-lisp/package.el | 13 +++++++------ Modified lisp/emacs-lisp/package.el diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 40d02f8..dadaf27 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1279,12 +1279,13 @@ Will throw an error if the archive version is too new." (let ((filename (expand-file-name file package-user-dir))) (when (file-exists-p filename) (with-temp-buffer - (insert-file-contents-literally filename) - (let ((contents (read (current-buffer)))) - (if (> (car contents) package-archive-version) - (error "Package archive version %d is higher than %d" - (car contents) package-archive-version)) - (cdr contents)))))) + (let ((coding-system-for-read 'utf-8)) + (insert-file-contents filename) + (let ((contents (read (current-buffer)))) + (if (> (car contents) package-archive-version) + (error "Package archive version %d is higher than %d" + (car contents) package-archive-version)) + (cdr contents))))))) (defun package-read-archive-contents (archive) "Re-read archive contents for ARCHIVE. --Apple-Mail=_B24151CE-33EE-4BF4-9149-6DEAC27047B1--