[Emacs-diffs] /srv/bzr/emacs/trunk r108880: Revert hscroll and min_hscroll to ptrdiff_t.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108880
fixes bug: http://debbugs.gnu.org/11857
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-05 18:20:12 +0300
message:
  Revert hscroll and min_hscroll to ptrdiff_t.
modified:
  src/ChangeLog
  src/window.h
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-05 15:04:57 +0000
+++ b/src/ChangeLog     2012-07-05 15:20:12 +0000
@@ -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  <address@hidden>
 
        * makefile.w32-in ($(BLD)/dired.$(O), $(BLD)/fileio.$(O)): Fix typo.

=== modified file 'src/window.h'
--- a/src/window.h      2012-07-05 15:04:57 +0000
+++ b/src/window.h      2012-07-05 15:20:12 +0000
@@ -238,11 +238,11 @@
     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.  */

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-07-05 15:04:57 +0000
+++ b/src/xdisp.c       2012-07-05 15:20:12 +0000
@@ -1258,7 +1258,7 @@
 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);