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

4 files changed, 9 insertions, 13 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index fb2a9bf72ed..c10fe3ddded 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -820,15 +820,7 @@ define xwindow
   xgetptr $
   print (struct window *) $ptr
   set $window = (struct window *) $ptr
-  xgetint $window->total_cols
-  set $width=$int
-  xgetint $window->total_lines
-  set $height=$int
-  xgetint $window->left_col
-  set $left=$int
-  xgetint $window->top_line
-  set $top=$int
-  printf "%dx%d+%d+%d\n", $width, $height, $left, $top
+  printf "%dx%d+%d+%d\n", $window->total_cols, $window->total_lines, $window->left_col, $window->top_line
 end
 document xwindow
 Print $ as a window pointer, assuming it is an Emacs Lisp window value.
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>
diff --git a/src/dispnew.c b/src/dispnew.c
index 289431d6dc4..70862985e66 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1638,7 +1638,7 @@ allocate_matrices_for_frame_redisplay (Lisp_Object window, int x, int y,
 
           /* Actually change matrices, if allowed.  Do not consider
              CHANGED_LEAF_MATRIX computed above here because the pool
-             may have been changed which we don't now here.  We trust
+             may have been changed which we don't know here.  We trust
              that we only will be called with DIM_ONLY_P when
              necessary.  */
           if (!dim_only_p)
diff --git a/src/window.c b/src/window.c
index ae28b714720..e3554ea032e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3854,7 +3854,7 @@ window_resize_check (struct window *w, bool horflag)
 }
 
 
-/* Set w->pixel_height (w->pixel_height if HORIZONTAL is non-zero) to
+/* Set w->pixel_height (w->pixel_width if HORFLAG is non-zero) to
    w->new_pixel for window W and recursively all child windows of W.
    Also calculate and assign the new vertical (horizontal) pixel start
    positions of each of these windows.
@@ -3944,7 +3944,7 @@ window_resize_apply (struct window *w, bool horflag)
 }
 
 
-/* Set w->total_lines (w->total_cols if HORIZONTAL is non-zero) to
+/* Set w->total_lines (w->total_cols if HORFLAG is non-zero) to
    w->new_total for window W and recursively all child windows of W.
    Also calculate and assign the new vertical (horizontal) start
    positions of each of these windows.  */