Avoid compilation warnings

* src/w32fns.c (Fx_file_dialog, w32_parse_and_hook_hot_key):
* src/w32term.c (x_draw_glyph_string):
* src/w32fns.c (compute_tip_xy):
* src/w32font.c (w32font_text_extents):
* src/w32menu.c (set_frame_menubar):
* src/search.c (Freplace_match): Avoid compiler warnings in
optimized builds.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/w32term.c b/src/w32term.c
index a2537e204d8..0f9dce9190c 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2454,7 +2454,7 @@ x_draw_glyph_string (struct glyph_string *s)
                     thickness = font->underline_thickness;
                   else
                     thickness = 1;
-                  if (x_underline_at_descent_line)
+                  if (x_underline_at_descent_line || !font)
                     position = (s->height - thickness) - (s->ybase - s->y);
                   else
                     {
@@ -2467,9 +2467,9 @@ x_draw_glyph_string (struct glyph_string *s)
                          ROUND (x) = floor (x + 0.5)  */
 
                       if (x_use_underline_position_properties
-                          && font && font->underline_position >= 0)
+                          && font->underline_position >= 0)
                         position = font->underline_position;
-                      else if (font)
+                      else
                         position = (font->descent + 1) / 2;
                     }
                   position = max (position, underline_minimum_offset);