summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui_gtk_x11.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index fc3d08b42..1f8b2ebcc 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3121,8 +3121,10 @@ update_window_manager_hints(int force_width, int force_height)
|GDK_HINT_MIN_SIZE;
// Using gui.formwin as geometry widget doesn't work as expected
// with GTK+ 2 -- dunno why. Presumably all the resizing hacks
- // in Vim confuse GTK+.
- gtk_window_set_geometry_hints(GTK_WINDOW(gui.mainwin), gui.mainwin,
+ // in Vim confuse GTK+. For GTK 3 the second argument should be NULL
+ // to make the width/height inc works, despite the docs saying
+ // something else.
+ gtk_window_set_geometry_hints(GTK_WINDOW(gui.mainwin), NULL,
&geometry, geometry_mask);
old_width = width;
old_height = height;
diff --git a/src/version.c b/src/version.c
index 80244d6fe..0e1e32616 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1563,
+/**/
1562,
/**/
1561,