2011-03-08 Paul Eggert <eggert@cs.ucla.edu>

* window.c (size_window): Mark variables that gcc -Wuninitialized
does not deduce are never used uninitialized.

2 files changed, 7 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ac2f0c418e1..e3b3c8c2566 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,6 @@
-2011-03-07  Paul Eggert  <eggert@cs.ucla.edu>
+2011-03-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+2011-03-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xmenu.c (menu_highlight_callback): Now static.
         (set_frame_menubar): Remove unused local.
@@ -23,6 +25,8 @@
         (run_window_configuration_change_hook, enlarge_window): Likewise.
 
         * window.c (display_buffer): Now static.
+        (size_window): Mark variables that gcc -Wuninitialized
+        does not deduce are never used uninitialized.
         * window.h (check_all_windows): New decl, to forestall
         gcc -Wmissing-prototypes diagnostic.
 
diff --git a/src/window.c b/src/window.c
index 838be475d51..eaa910571e0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3124,7 +3124,7 @@ size_window (Lisp_Object window, int size, int width_p, int nodelete_p, int firs
     }
   else if (!NILP (*forward))
     {
-      int fixed_size, each, extra, n;
+      int fixed_size, each IF_LINT (= 0), extra IF_LINT (= 0), n;
       int resize_fixed_p, nfixed;
       int last_pos, first_pos, nchildren, total;
       int *new_sizes = NULL;
@@ -5522,7 +5522,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
   struct buffer *obuf = current_buffer;
   int center_p = 0;
   EMACS_INT charpos, bytepos;
-  int iarg;
+  int iarg IF_LINT (= 0);
   int this_scroll_margin;
 
   /* If redisplay is suppressed due to an error, try again.  */