diff options
| author | Kenichi Handa | 2012-05-04 18:26:36 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-05-04 18:26:36 +0800 |
| commit | e59fb960ee3bacf937cab11b1b23e6c7389de3ed (patch) | |
| tree | ea7410da4c94286716a8afda64c4c8ef79dfd44b /lisp/ChangeLog | |
| parent | f16e53860f281bc6677c2835d5b0225831a41739 (diff) | |
| download | emacs-e59fb960ee3bacf937cab11b1b23e6c7389de3ed.tar.gz emacs-e59fb960ee3bacf937cab11b1b23e6c7389de3ed.zip | |
Backport fix for Bug#11282 from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dbbb2fb4c76..ff08f0681aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,6 +3,12 @@ | |||
| 3 | * select.el (xselect--encode-string): Always use utf-8 for TEXT on | 3 | * select.el (xselect--encode-string): Always use utf-8 for TEXT on |
| 4 | Nextstep. | 4 | Nextstep. |
| 5 | 5 | ||
| 6 | 2012-05-03 Kenichi Handa <handa@m17n.org> | ||
| 7 | |||
| 8 | * mail/rmailmm.el (rmail-show-mime): Catch an error caused by text | ||
| 9 | decoding, and show a warning message without signalling an error | ||
| 10 | (Bug#11282). | ||
| 11 | |||
| 6 | 2012-04-30 Eli Zaretskii <eliz@gnu.org> | 12 | 2012-04-30 Eli Zaretskii <eliz@gnu.org> |
| 7 | 13 | ||
| 8 | * mail/rmail.el (rmail-yank-current-message): Use the encoding of | 14 | * mail/rmail.el (rmail-yank-current-message): Use the encoding of |