summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/scroll.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 34104669a53..d491d089514 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ * scroll.c (do_scrolling): Work around GCC bug 48228.
+ See <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48228>.
+
2011-03-21 Paul Eggert <eggert@cs.ucla.edu>
* frame.c (Fmodify_frame_parameters): Simplify loop counter.
diff --git a/src/scroll.c b/src/scroll.c
index 33af18d2090..f013ebbee0e 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -245,8 +245,8 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct m
int i, j, k;
/* Set to 1 if we have set a terminal window with
- set_terminal_window. */
- int terminal_window_p = 0;
+ set_terminal_window. It's unsigned to work around GCC bug 48228. */
+ unsigned int terminal_window_p = 0;
/* A queue for line insertions to be done. */
struct queue { int count, pos; };