diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4308d4085fa..50afbc2002d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-03-19 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el (describe-package-1): | ||
| 4 | Decode commentary (bug#16733). | ||
| 5 | |||
| 1 | 2014-03-18 Juanma Barranquero <lekktu@gmail.com> | 6 | 2014-03-18 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * custom.el (defcustom): Doc fix: recommend avoiding destructive | 8 | * 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." | |||
| 1531 | (setq readme-string (buffer-string)) | 1531 | (setq readme-string (buffer-string)) |
| 1532 | t)) | 1532 | t)) |
| 1533 | (error nil)) | 1533 | (error nil)) |
| 1534 | (insert readme-string)) | 1534 | (let ((coding (detect-coding-string readme-string t))) |
| 1535 | (insert (decode-coding-string readme-string coding t)))) | ||
| 1535 | ((file-readable-p readme) | 1536 | ((file-readable-p readme) |
| 1536 | (insert-file-contents readme) | 1537 | (insert-file-contents readme) |
| 1537 | (goto-char (point-max)))))))) | 1538 | (goto-char (point-max)))))))) |