summaryrefslogtreecommitdiff
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
commitb31fe7e3db6873460f3ef5f6a81494336e960c08 (patch)
tree84368fa0419738c5250d693ec1e4577a09d5376b
parent6a4d6326e08612f1d7ea1323319b5d27955e159d (diff)
downloadvim-b31fe7e3db6873460f3ef5f6a81494336e960c08.tar.gz
updated for version 7.3.1286v7.3.1286v7-3-1286
Problem: Check for screen size missing for Athena and Motif. Solution: Add call to limit_screen_size().
-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 41fcbde2..f09d1a0c 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 8f7905b3..d73254f5 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,