summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-07-01 21:43:08 +0200
committerBram Moolenaar <Bram@vim.org>2013-07-01 21:43:08 +0200
commitc33916a6e06db94ea1a3dfd35eee32ca80787ec5 (patch)
treec7c53a29ec0b869459e5e5c9959b6e056608c44b /src
parentf5901aa1959414a728c4ae6a41b8bf8ac7006a66 (diff)
downloadvim-git-c33916a6e06db94ea1a3dfd35eee32ca80787ec5.tar.gz
updated for version 7.3.1286v7.3.1286
Problem: Check for screen size missing for Athena and Motif. Solution: Add call to limit_screen_size().
Diffstat (limited to 'src')
-rw-r--r--src/gui_x11.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 41fcbde2b..f09d1a0c3 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1431,6 +1431,7 @@ gui_mch_init()
p_window = h - 1;
Rows = h;
}
+ limit_screen_size();
/*
* 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
diff --git a/src/version.c b/src/version.c
index 8f7905b31..d73254f5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1286,
+/**/
1285,
/**/
1284,