updated for version 7.1-119

diff --git a/src/option.c b/src/option.c
index 59a2fa343d5857513dff7dcfa2fc74a6554fcd5a..0bdc0a4007ce578b2e3f13975ae5c7e30155c49d 100644 (file)
--- 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 9a40b66e43c218bc965cec5ceee42a6694647713..343ae3d03a79df7185bfc0e5256b7528d4e419ce 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    119,
 /**/
     118,
 /**/

diff --git a/src/window.c b/src/window.c
index 62a39d56763dfa3bfc81c0720770e3418524f8c7..95f4a246ca0e3f81854f7c1a110acf773e106f1a 100644 (file)
--- 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;
                }