Merge from origin/emacs-26

5381c70b7a In windows.texi mention special splitting behavior of side...
46d62b9f36 * lisp/gnus/gnus-group.el (gnus-group-mode-map): Bind [fol...
1ef1dbdbc5 Avoid compilation warning in xterm.c
5cf3c26f2d * README: Document all the top-level directories.  (Bug#29...
e9ea2065a8 Don't enable erc modules on simply loading erc.el

1 files changed, 2 insertions, 2 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 1b45cf1b0b7..e42216886bc 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3517,13 +3517,13 @@ x_draw_underwave (struct glyph_string *s)
 
   x_get_scale_factor (s->display, &scale_x, &scale_y);
 
-  int wave_height = 3 * scale_y, wave_length = 2 * scale_x, thickness = scale_y;
+  int wave_height = 3 * scale_y, wave_length = 2 * scale_x;
 
 #ifdef USE_CAIRO
   x_draw_horizontal_wave (s->f, s->gc, s->x, s->ybase - wave_height + 3,
                           s->width, wave_height, wave_length);
 #else  /* not USE_CAIRO */
-  int dx, dy, x0, y0, width, x1, y1, x2, y2, xmax;
+  int dx, dy, x0, y0, width, x1, y1, x2, y2, xmax, thickness = scale_y;;
   bool odd;
   XRectangle wave_clip, string_clip, final_clip;