patch 8.1.2272: test may hang at more prompt

Problem:    Test may hang at more prompt.
Solution:   Reset 'more' after resetting 'compatible'. (Michael Soyka)

diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index f1f6fd0b87a38fc581a94c9d0bcbcca5db1fbc63..89112dead236d3f3835d507d2283ab2ce25f6efc 100644 (file)
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -1632,7 +1632,7 @@ func s:DoNothing()
 endfunc
 
 func Test_script_local_func()
-  set nocp viminfo+=nviminfo
+  set nocp nomore viminfo+=nviminfo
   new
   nnoremap <buffer> _x :call <SID>DoNothing()<bar>call <SID>DoLast()<bar>delfunc <SID>DoNothing<bar>delfunc <SID>DoLast<cr>
 

diff --git a/src/version.c b/src/version.c
index 5ceb369976427dde91f11baceb1bb77b1f242779..77b3a8a48e7baef895714101dfc25b6214618203 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2272,
 /**/
     2271,
 /**/