From: Steve Purcell <steve@sanityinc.com>
Date: Sun, 19 Apr 2015 16:47:02 +0000 (+0100)
Subject: Assume package archive-contents are UTF8-encoded
X-Git-Tag: emacs-25.0.90~2364
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4155619aacae2a225cec7ba9008f15258d30a7e0;p=emacs.git

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)

Co-authored-by: Steve Purcell <steve@sanityinc.com>
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 2fb54f0d944..9cd6b3b9a66 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1283,7 +1283,8 @@ 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 ((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"