diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-09-25 12:51:28 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-09-25 12:51:28 +0000 |
| commit | 719939c888fe583419eec652a7cc71172bf3afb1 (patch) | |
| tree | 4ed0721c162b23f5f196dd5c1f0081af23525324 | |
| parent | b8dc4d4cdf95bac309bfff342da0eee5159c1c7e (diff) | |
| download | vim-git-719939c888fe583419eec652a7cc71172bf3afb1.tar.gz | |
updated for version 7.1-119v7.1.119
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index 59a2fa343..0bdc0a400 100644 --- a/src/option.c +++ b/src/option.c @@ -7824,6 +7824,8 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags) errmsg = e_positive; p_ch = 1; } + if (p_ch > Rows - min_rows() + 1) + p_ch = Rows - min_rows() + 1; /* Only compute the new window layout when startup has been * completed. Otherwise the frame sizes may be wrong. */ diff --git a/src/version.c b/src/version.c index 9a40b66e4..343ae3d03 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 119, +/**/ 118, /**/ 117, diff --git a/src/window.c b/src/window.c index 62a39d567..95f4a246c 100644 --- a/src/window.c +++ b/src/window.c @@ -5523,6 +5523,7 @@ command_height() { EMSG(_(e_noroom)); p_ch = old_p_ch; + curtab->tp_ch_used = p_ch; cmdline_row = Rows - p_ch; break; } |