[Emacs-diffs] /srv/bzr/emacs/trunk r108476: * xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall.

[Paul Eggert]

------------------------------------------------------------
revno: 108476
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-06-03 23:03:19 -0700
message:
  * xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-03 23:28:17 +0000
+++ b/src/ChangeLog     2012-06-04 06:03:19 +0000
@@ -1,3 +1,7 @@
+2012-06-04  Paul Eggert  <address@hidden>
+
+       * xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall.
+
 2012-06-03  Glenn Morris  <address@hidden>
 
        * xdisp.c (tool-bar-style): Doc fix.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-06-03 23:28:17 +0000
+++ b/src/xdisp.c       2012-06-04 06:03:19 +0000
@@ -26967,12 +26967,12 @@
   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)
     {