diff --git a/src/ChangeLog b/src/ChangeLog
index fef02d8cbb55ae0d5b7e7ac05a94a8621308f820..c8f756455856b28179a2c8bd40a8b271136283fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* dispnew.c (update_frame_1): Pacify gcc -Wstrict-overflow
+	for GCC 4.7.1 x86-64.
+
 2012-08-30  Glenn Morris  <rgm@gnu.org>
 
 	* lread.c (init_lread): For out-of-tree builds, only add the
diff --git a/src/dispnew.c b/src/dispnew.c
index 4e3078801117e4c110e89250d15aedb0bb4498eb..2d232d49c53a4aa1bac0a04167e9504d09792798 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4690,6 +4690,7 @@ update_frame_1 (struct frame *f, bool force_p, bool inhibit_id_p)
 	}
     }
 
+  lint_assume (0 <= FRAME_LINES (f));
   pause_p = 0 < i && i < FRAME_LINES (f) - 1;
 
   /* Now just clean up termcap drivers and set cursor, etc.  */