1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ccf1fea9514..435f90abad9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Arithmetic overflows now return float rather than wrapping around.
+        * data.c: Include <intprops.h>.
+        (arith_driver): Use floating point if the accumulator would otherwise
+        go out of EMACS_INT range.
+        (arith_driver, Fadd1, Fsub1): Use floating point if the result is
+        out of Emacs fixnum range.
+        * bytecode.c (exec_byte_code): Likewise, for Bsub1, Badd1, Bnegate.
+
         * callproc.c (Fcall_process): Use 'volatile' to avoid vfork clobbering.
 
         * process.c (Fformat_network_address): Fix typo: args2 -> *args2.