patch 8.2.1276: MS-Windows: system test may fail if more.exe is installed

Problem:    MS-Windows: system test may fail if more.exe is installed.
Solution:   Explicitly use more.com. (Taro Muraoka, Ken Takata, closes #6517)

diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
index d597873895586c2f2f81ded47e7a926e98e44c50..9e63f518659b9cf48a89168013d929a279ee3ccc 100644 (file)
--- a/src/testdir/test_system.vim
+++ b/src/testdir/test_system.vim
@@ -13,9 +13,9 @@ func Test_System()
   else
     call assert_equal("123\n", system('echo 123'))
     call assert_equal(["123\r"], systemlist('echo 123'))
-    call assert_equal("123\n",   system('more', '123'))
-    call assert_equal(["123\r"], systemlist('more', '123'))
-    call assert_equal(["as\r", "df\r"], systemlist('more', ["as\<NL>df"]))
+    call assert_equal("123\n",   system('more.com', '123'))
+    call assert_equal(["123\r"], systemlist('more.com', '123'))
+    call assert_equal(["as\r", "df\r"], systemlist('more.com', ["as\<NL>df"]))
   endif
 
   new Xdummy
@@ -42,7 +42,7 @@ func Test_System()
     let out = systemlist('cat', bufnr('%'))
     call assert_equal(['asdf', "pw\<NL>er", 'xxxx'],  out)
   else
-    let out = systemlist('more', bufnr('%'))
+    let out = systemlist('more.com', bufnr('%'))
     call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"],  out)
   endif
   bwipe!

diff --git a/src/version.c b/src/version.c
index 3489c45bac076ff369d017bf08c8f54771896c74..e0115c649d09bb131c71e60bb5baca94db311d13 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1276,
 /**/
     1275,
 /**/