summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68e8b764ec4..17664888135 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -906,7 +906,7 @@
2012-05-03 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el (rmail-show-mime): Catch an error caused by text
- decoding, and show a warning message without signalling an error
+ decoding, and show a warning message without signaling an error
(Bug#11282).
2012-05-03 Stefan Monnier <monnier@iro.umontreal.ca>