summaryrefslogtreecommitdiff
path: root/src/gui_x11.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-05-02 22:08:30 +0000
committerBram Moolenaar <Bram@vim.org>2006-05-02 22:08:30 +0000
commitd68071d8da46caf46581ae55aaca241e2dbf62c3 (patch)
treeaa3ff9a9d640cad7c56bc626b1dd1e53af084d67 /src/gui_x11.c
parentc9b4b05b3544b434730eb218e848a1a441d5ffb2 (diff)
downloadvim-git-d68071d8da46caf46581ae55aaca241e2dbf62c3.tar.gz
updated for version 7.0g01
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 c49bbe5f4..01f4e0f5c 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