Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ced4734bc9a49a53375db07d665ba3bb6d0b2f6..d46e34c852514918187a0c7689d7b6c4b0b74dbe 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix coding.c subscript error
+       * coding.c (CODING_ISO_INVOKED_CHARSET):
+       Avoid undefined behavior if CODING_ISO_INVOCATION returns negative.
+
 2015-01-17  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (produce_image_glyph): Fix display of images in R2L