Mercurial > vim

changeset 1404:b00bc2bf23eb v7.1.119

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-119
author vimboss
date Tue, 25 Sep 2007 12:51:28 +0000
parents 871231399cf5
children b63792dadc23
files src/option.c src/version.c src/window.c
diffstat 3 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/option.c
+++ b/src/option.c
@@ -7824,6 +7824,8 @@ set_num_option(opt_idx, varp, value, err
 	    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. */
--- 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,
--- 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;
 		}