From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 6 Mar 2011 22:22:56 +0000 (-0800)
Subject: xdisp.c (draw_glyphs):
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~78
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=44a3a108430ef79370ad2957a5d71d4cd040962b;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 5f7cc98ee2a..c0e350e45f9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,8 +5,8 @@
 	(Fcurrent_bidi_paragraph_direction): Simplify slightly; this
 	avoids a gcc -Wuninitialized diagnostic.
 	(display_line, BUILD_COMPOSITE_GLYPH_STRING, draw_glyphs):
-	Mark variables that gcc -Wuninitialized cannot deduce are never
-	used uninitialized.
+	(note_mouse_highlight): Mark variables that gcc -Wuninitialized
+	does not 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 7d6190ed8ce..f7f887f7850 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25457,7 +25457,8 @@ note_mouse_highlight (struct frame *f, int x, int y)
 	    {
 	      /* The mouse-highlighting, if any, comes from an overlay
 		 or text property in the buffer.  */
-	      Lisp_Object buffer, cover_string;
+	      Lisp_Object buffer IF_LINT (= Qnil);
+	      Lisp_Object cover_string IF_LINT (= Qnil);
 
 	      if (STRINGP (object))
 		{