Revert hscroll and min_hscroll to ptrdiff_t.

Fixes: debbugs:11857

diff --git a/src/ChangeLog b/src/ChangeLog
index d14c322cadfd75df5215bb69c137c357b07ed6ec..6c3810c6bac30791daac15b7e7910cc0efb9a9c6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,9 +5,6 @@
        coordinates when window's hscroll is set to insanely large
        values.  (Bug#11857)
 
-       * window.h (struct window) <hscroll, min_hscroll>: Change type to
-       'int'.
-
 2012-07-05  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in ($(BLD)/dired.$(O), $(BLD)/fileio.$(O)): Fix typo.

diff --git a/src/window.h b/src/window.h
index 2684713eb6b6b851e03539b83e2be98bd8e26e6a..10cabed979bbf0dc756bc544b41766d4fc2965cd 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -238,11 +238,11 @@ struct window
     int sequence_number;
 
     /* Number of columns display within the window is scrolled to the left.  */
-    int hscroll;
+    ptrdiff_t hscroll;
 
     /* Minimum hscroll for automatic hscrolling.  This is the value
        the user has set, by set-window-hscroll for example.  */
-    int min_hscroll;
+    ptrdiff_t min_hscroll;
 
     /* Displayed buffer's text modification events counter as of last time
        display completed.  */

diff --git a/src/xdisp.c b/src/xdisp.c
index e6ad6a0bd788b6a1570dc142ddac45706b1181a4..d24c05172b61c1d83f1011c931af20ef0d71abf1 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1258,7 +1258,7 @@ string_from_display_spec (Lisp_Object spec)
 static inline int
 window_hscroll_limited (struct window *w, struct frame *f)
 {
-  int window_hscroll = w->hscroll;
+  ptrdiff_t window_hscroll = w->hscroll;
   int window_text_width = window_box_width (w, TEXT_AREA);
   int colwidth = FRAME_COLUMN_WIDTH (f);