aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorMichael Albinus2014-11-13 16:29:20 +0100
committerMichael Albinus2014-11-13 16:29:20 +0100
commitd856e6b0d87fed67001e83fcfccba9c932af3487 (patch)
treea4bf9bbfeedc89d0d7ed5240910cc890445ce4ca /src/ChangeLog
parenta85cf0d9fe03713cfae31415208cbd49d3227ae1 (diff)
parent38fa4bcbd238a0628ca51c5cd656211a0ef62eef (diff)
downloademacs-d856e6b0d87fed67001e83fcfccba9c932af3487.tar.gz
emacs-d856e6b0d87fed67001e83fcfccba9c932af3487.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Conflicts: lisp/ChangeLog
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d44de652dde..2be24fa851b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12014-11-13 Paul Eggert <eggert@cs.ucla.edu>
2
3 Avoid undefined behavior in color table hashing.
4 * image.c (CT_HASH_RGB) [COLOR_TABLE_SUPPORT]: Remove, replacing with ...
5 (ct_hash_rgb) [COLOR_TABLE_SUPPORT]: New function. All uses changed.
6 This function avoids undefined behavior with signed shift overflow.
7
12014-11-10 Eli Zaretskii <eliz@gnu.org> 82014-11-10 Eli Zaretskii <eliz@gnu.org>
2 9
3 * fileio.c (Finsert_file_contents): Invalidate buffer caches also 10 * fileio.c (Finsert_file_contents): Invalidate buffer caches also