From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 19 Mar 2014 16:14:26 +0000 (+0100)
Subject: lisp/emacs-lisp/package.el (describe-package-1): Decode commentary (bug#16733).
X-Git-Tag: emacs-24.3.90~149
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f88bdc45e02c8d6418b55102ec66cd446c956d93;p=emacs.git

lisp/emacs-lisp/package.el (describe-package-1): Decode commentary (bug#16733).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4308d4085fa..50afbc2002d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacs-lisp/package.el (describe-package-1):
+	Decode commentary (bug#16733).
+
 2014-03-18  Juanma Barranquero  <lekktu@gmail.com>
 
 	* custom.el (defcustom): Doc fix: recommend avoiding destructive
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d8d479871b2..e0d1c99d369 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1531,7 +1531,8 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
                        (setq readme-string (buffer-string))
                        t))
 		 (error nil))
-	       (insert readme-string))
+	       (let ((coding (detect-coding-string readme-string t)))
+		 (insert (decode-coding-string readme-string coding t))))
 	      ((file-readable-p readme)
 	       (insert-file-contents readme)
 	       (goto-char (point-max))))))))