From c05cf3902ae658cc8bf413124245c9e1cdcca2d7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 3 Jun 2012 23:03:19 -0700 Subject: [PATCH] * xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall. --- src/ChangeLog | 4 ++++ src/xdisp.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e7a5b3bcc11..7a9ab1757eb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-06-04 Paul Eggert + + * xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall. + 2012-06-03 Glenn Morris * xdisp.c (tool-bar-style): Doc fix. diff --git a/src/xdisp.c b/src/xdisp.c index 06f6bf987fb..5bb1b6deb9f 100644 --- 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) { -- 2.39.2