summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-04-15 15:37:25 +0200
committerBram Moolenaar <Bram@vim.org>2017-04-15 15:37:25 +0200
commit43d1ac6e81a6796f2e6b3514bbe029cf9bd0a0ae (patch)
treede5766d8d6f12dbdf2e63272b399c5f37778359c
parent31bdd13c335533c749993b57dcd980a87373139e (diff)
patch 8.0.0566: setting nocompatible for the tiny version moves the cursorv8.0.0566
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)
-rw-r--r--runtime/defaults.vim12
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 8 deletions
diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index f4d22bde49..6fd43db51b 100644
--- 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
-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 a68b999d66..50f110a017 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 566,
+/**/
565,
/**/
564,