updated for version 7.0-143

diff --git a/src/option.c b/src/option.c
index aa8a70e6c6a80a7a94b9ea130d7f8827554fae80..0bd218c9786e978879d5bfcb853d803b307410b7 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -3405,7 +3405,7 @@ set_option_default(opt_idx, opt_flags, compatible)
        }
        else if (flags & P_NUM)
        {
-           if (varp == (char_u *)PV_SCROLL)
+           if (options[opt_idx].indir == PV_SCROLL)
                win_comp_scroll(curwin);
            else
            {

diff --git a/src/version.c b/src/version.c
index 3bd726ddd4b38054b69ff230635e43e831cd21e6..85176f746a3e4e5b75b9798b8954e03ba20d574b 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 */
+/**/
+    143,
 /**/
     142,
 /**/