Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5a359e02863dfb303df2870d3a6d4a3db3b924d1..49be20a5f79fdf60d04d5ad68f2f8aa5a2511a84 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Specify coding if Latin-1 Emacs would misinterpret (Bug#17575).
+       * ETAGS.EBNF, NEWS, ORG-NEWS: Add "coding: utf-8".
+
 2014-05-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: Assume C99 or later (Bug#17487).