diff options
author | Bram Moolenaar <Bram@vim.org> | 2012-08-23 13:28:55 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2012-08-23 13:28:55 +0200 |
commit | 4d93dc2699845009e0f263ed10196309c1175c2e (patch) | |
tree | 8b7c6cd1ef953a3195d60d914306e1af880ef4af | |
parent | b9ce83e135331d74f09ec094528243f33c3ada85 (diff) | |
download | vim-git-4d93dc2699845009e0f263ed10196309c1175c2e.tar.gz |
updated for version 7.3.635v7.3.635
Problem: Issue 21: System call during startup sets 'lines' to a wrong
value. (Karl Yngve)
Solution: Don't set the shell size while the GUI is still starting up.
(Christian Brabandt)
-rw-r--r-- | src/ui.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -298,6 +298,9 @@ ui_get_shellsize() int retval; #ifdef FEAT_GUI + if (gui.starting) + /* possibly a system call during startup, check later */ + return OK; if (gui.in_use) retval = gui_get_shellsize(); else diff --git a/src/version.c b/src/version.c index 2fbc886e3..5551da4be 100644 --- a/src/version.c +++ b/src/version.c @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 635, +/**/ 634, /**/ 633, |