Merge from emacs-24; up to 2014-06-26T06:55:15Z!rgm@gnu.org

1 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f74a46c4ad2..57d49594d7a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2014-07-28  Eli Zaretskii  <eliz@gnu.org>
 
+        * .gdbinit (xwindow): The members total_cols, total_lines,
+        left_col, and top_line are C integers (and has been so for the
+        last 1.5 years).
+
         * .gdbinit (xsubchartable): The members 'depth' and 'min_char' are
         now C integers.
 
@@ -4479,7 +4483,7 @@
         Avoid undefined behavior with huge regexp interval counts.
         * regex.c (GET_INTERVAL_COUNT): Rename from 'GET_UNSIGNED_NUMBER',
         since it's now specialized to interval counts.  All uses changed.
-        Do not assume wrapraound on signed integer overflow.
+        Do not assume wraparound on signed integer overflow.
         (regex_compile): Simplify based on the above changes.
 
 2013-12-12  Eli Zaretskii  <eliz@gnu.org>