From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 6 Mar 2011 22:11:02 +0000 (-0800)
Subject: xdisp.c (draw_glyphs):
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~79
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e086e8f7f79c0473a00153ba70c7febab7d0712;p=emacs.git

xdisp.c (draw_glyphs):
Mark variables that gcc -Wuninitialized cannot deduce are never
used uninitialized.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ff8c5fd027d..5f7cc98ee2a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,8 +4,9 @@
 	Add a FIXME comment, since the code still doesn't look right.
 	(Fcurrent_bidi_paragraph_direction): Simplify slightly; this
 	avoids a gcc -Wuninitialized diagnostic.
-	(display_line, BUILD_COMPOSITE_GLYPH_STRING): Mark variables that
-	gcc -Wuninitialized cannot deduce are never used uninitialized.
+	(display_line, BUILD_COMPOSITE_GLYPH_STRING, draw_glyphs):
+	Mark variables that gcc -Wuninitialized cannot deduce are never
+	used uninitialized.
 
 	* lisp.h (IF_LINT): New macro, copied from ../lib-src/emacsclient.c
 	which in turn is copied from coreutils.
diff --git a/src/xdisp.c b/src/xdisp.c
index 0f8fd3d0477..7d6190ed8ce 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21293,7 +21293,8 @@ draw_glyphs (struct window *w, int x, struct glyph_row *row,
     {
       struct glyph_string *h, *t;
       Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
-      int mouse_beg_col, mouse_end_col, check_mouse_face = 0;
+      int mouse_beg_col IF_LINT (= 0), mouse_end_col IF_LINT (= 0);
+      int check_mouse_face = 0;
       int dummy_x = 0;
 
       /* If mouse highlighting is on, we may need to draw adjacent