bug#20231: 25.0.50; package.el mangles non-ascii content in downloaded archive-contents data

[Steve Purcell <steve@sanityinc.com>]

[-- Attachment #1: Type: text/plain, Size: 109 bytes --]

The attached patch seems reasonable and works nicely for me. Happy to modify it if necessary.

-Steve



[-- Attachment #2: archive-contents-encoding.patch --]
[-- Type: application/octet-stream, Size: 1794 bytes --]

4dc1966abf44aff8baab2bf20a395260ea640428 HEAD master
Author: Steve Purcell <steve@sanityinc.com>
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.