2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 282275ffa06..5f4b3a9e7a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-09-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Fix minor problem found by static checking.
+        * xdisp.c (reseat_at_next_visible_line_start): Mark locals as
+        initialized, to pacify gcc -Wuninitialized.
+
         * fileio.c: Report proper errno when syscall falls.
         (Finsert_file_contents): Save and restore errno,
         so that report_file_error outputs the correct diagnostic.
diff --git a/src/xdisp.c b/src/xdisp.c
index f889815fa1e..fbf30092ca1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5722,9 +5722,10 @@ reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
 {
   int newline_found_p, skipped_p = 0;
   struct bidi_it bidi_it_prev;
-  int new_paragraph, first_elt, disp_prop;
-  EMACS_INT paragraph_end, disp_pos;
-  bidi_dir_t paragraph_dir;
+  int new_paragraph IF_LINT (= 0), first_elt IF_LINT (= 0);
+  int disp_prop IF_LINT (= 0);
+  EMACS_INT paragraph_end IF_LINT (= 0), disp_pos IF_LINT (= 0);
+  bidi_dir_t paragraph_dir IF_LINT (= 0);
 
   newline_found_p = forward_to_next_line_start (it, &skipped_p, &bidi_it_prev);