aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-07-11 15:45:24 +0000
committerGerd Moellmann2001-07-11 15:45:24 +0000
commit8ee5b6a3963659c95e124efda55c11dbe045957d (patch)
tree7d7f982e6f94452e316a3993557c1cffa8c084fe
parentd0e2444ef8c7d4d713a863e32350c88200913ae5 (diff)
downloademacs-8ee5b6a3963659c95e124efda55c11dbe045957d.tar.gz
emacs-8ee5b6a3963659c95e124efda55c11dbe045957d.zip
(try_cursor_movement): Prevent a warning from GCC 3.0.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xdisp.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d856d227807..c684a4fcca6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12001-07-11 Gerd Moellmann <gerd@gnu.org> 12001-07-11 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xdisp.c (try_cursor_movement): Prevent a warning from GCC 3.0.
4
3 * fileio.c (unwind_read): Print a message when discarding inserted 5 * fileio.c (unwind_read): Print a message when discarding inserted
4 text or switching the buffer to unibyte. Change parameter. 6 text or switching the buffer to unibyte. Change parameter.
5 (Finsert_file_contents): Don't pass VISIT to unwind_read. 7 (Finsert_file_contents): Don't pass VISIT to unwind_read.
diff --git a/src/xdisp.c b/src/xdisp.c
index f0c919fecc0..fb148ee8200 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9579,7 +9579,7 @@ try_cursor_movement (window, startp, scroll_step)
9579 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) 9579 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer))
9580 { 9580 {
9581 int this_scroll_margin; 9581 int this_scroll_margin;
9582 struct glyph_row *row; 9582 struct glyph_row *row = NULL;
9583 9583
9584#if GLYPH_DEBUG 9584#if GLYPH_DEBUG
9585 debug_method_add (w, "cursor movement"); 9585 debug_method_add (w, "cursor movement");