* xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall.

diff --git a/src/ChangeLog b/src/ChangeLog
index e7a5b3bcc114228efcbba2b50972f0ae01a4e8b8..7a9ab1757eb9ef1a35b3b9e70efc4147334190fe 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall.
+
 2012-06-03  Glenn Morris  <rgm@gnu.org>
 
        * xdisp.c (tool-bar-style): Doc fix.

diff --git a/src/xdisp.c b/src/xdisp.c
index 06f6bf987fbcb9a6b223fbd2133ea32ffccc22af..5bb1b6deb9f2704d514472bb7c7a43fbe6a342a3 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26967,12 +26967,12 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y,
   int dx, dy, width, height;
   ptrdiff_t charpos;
   Lisp_Object string, object = Qnil;
-  Lisp_Object pos, help;
+  Lisp_Object pos IF_LINT (= Qnil), help;
 
   Lisp_Object mouse_face;
   int original_x_pixel = x;
   struct glyph * glyph = NULL, * row_start_glyph = NULL;
-  struct glyph_row *row;
+  struct glyph_row *row IF_LINT (= 0);
 
   if (area == ON_MODE_LINE || area == ON_HEADER_LINE)
     {