2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d75ec22b9f9..0a9c3d88ca5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * dispnew.c (scrolling_window): Return 1 if we scrolled,
+        to match comment at start of function.  This also removes a
+        GCC warning about overflow in a 32+64-bit port.
+
         * lisp.h (EMACS_INT, EMACS_UINT, BITS_PER_EMACS_INT, pI): Simplify.
 
         * dbusbind.c: Do not use XPNTR on a value that may be an integer.
diff --git a/src/dispnew.c b/src/dispnew.c
index 13e920166c5..0457d650b3a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4576,8 +4576,8 @@ scrolling_window (struct window *w, int header_line_p)
   for (i = 0; i < row_entry_idx; ++i)
     row_table[row_entry_pool[i].bucket] = NULL;
 
-  /* Value is > 0 to indicate that we scrolled the display.  */
-  return nruns;
+  /* Value is 1 to indicate that we scrolled the display.  */
+  return 0 < nruns;
 }