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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4308d4085fa894d3087a0f2816f10712dead7fce..50afbc2002d1bf0876f8b1eb89dbcce9eb58f2cd 100644 (file)
--- 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 d8d479871b22cff42815f92291aaab7b21830305..e0d1c99d369932fbfd2698f24f86f5997470b750 100644 (file)
--- 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))))))))