summaryrefslogtreecommitdiffstats
path: root/src/gui_x11.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui_x11.c')
-rw-r--r--src/gui_x11.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui_x11.c b/src/gui_x11.c
index c49bbe5f42..01f4e0f5cd 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1437,7 +1437,11 @@ gui_mch_init()
if (mask & WidthValue)
Columns = w;
if (mask & HeightValue)
+ {
+ if (p_window > h - 1 || !option_was_set((char_u *)"window"))
+ p_window = h - 1;
Rows = h;
+ }
/*
* Set the (x,y) position of the main window only if specified in the
* users geometry, so we get good defaults when they don't. This needs