patch 8.0.0566: setting nocompatible for the tiny version moves the cursor

Problem:    Setting nocompatible for the tiny version moves the cursor.
Solution:   Use another trick to skip commands when the +eval feature is
            present. (Christian Brabandt, closes #1630)

diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index f4d22bde494ecc573d6cf733ccf8ae0d2a4958f9..6fd43db51b0060ebb702d77a060363c8be0b2f49 100644 (file)
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last change: 2017 Apr 01
+" Last change: 2017 Apr 12
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -28,13 +28,9 @@ endif
 
 " When the +eval feature is missing, the set command above will be skipped.
 " Use a trick to reset compatible only when the +eval feature is missing.
-if 1
-  nnoremap : :"
-endif
-silent normal :set nocompatible\r
-if 1
-  nunmap :
-endif
+silent! while 0
+  set nocompatible
+silent! endwhile
 
 " Allow backspacing over everything in insert mode.
 set backspace=indent,eol,start

diff --git a/src/version.c b/src/version.c
index a68b999d66bb3c3bc55486f0ccd16d7baebcf368..50f110a0178cbc9538ac6296857e6fa658c7e9a4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    566,
 /**/
     565,
 /**/