aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-08-30 08:07:00 -0700
committerPaul Eggert2012-08-30 08:07:00 -0700
commitb98521dbff31c97469cd5455a48eed0e7f475cf4 (patch)
treecb7c1ff1aaa5461e672083c6b46ad8d55683eae4 /src
parent8b0c72d319128b339582e1d2ed772353a6404cad (diff)
downloademacs-b98521dbff31c97469cd5455a48eed0e7f475cf4.tar.gz
emacs-b98521dbff31c97469cd5455a48eed0e7f475cf4.zip
* dispnew.c (update_frame_1): Pacify gcc -Wstrict-overflow
for GCC 4.7.1 x86-64.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dispnew.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fef02d8cbb5..c8f75645585 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-08-30 Paul Eggert <eggert@cs.ucla.edu>
2
3 * dispnew.c (update_frame_1): Pacify gcc -Wstrict-overflow
4 for GCC 4.7.1 x86-64.
5
12012-08-30 Glenn Morris <rgm@gnu.org> 62012-08-30 Glenn Morris <rgm@gnu.org>
2 7
3 * lread.c (init_lread): For out-of-tree builds, only add the 8 * lread.c (init_lread): For out-of-tree builds, only add the
diff --git a/src/dispnew.c b/src/dispnew.c
index 4e307880111..2d232d49c53 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)
4690 } 4690 }
4691 } 4691 }
4692 4692
4693 lint_assume (0 <= FRAME_LINES (f));
4693 pause_p = 0 < i && i < FRAME_LINES (f) - 1; 4694 pause_p = 0 < i && i < FRAME_LINES (f) - 1;
4694 4695
4695 /* Now just clean up termcap drivers and set cursor, etc. */ 4696 /* Now just clean up termcap drivers and set cursor, etc. */