diff options
| -rw-r--r-- | runtime/optwin.vim | 8 | ||||
| -rw-r--r-- | runtime/vimrc_example.vim | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 5fcfad04a3..3d585267d7 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -710,6 +710,10 @@ call <SID>Header("editing text") call append("$", "undolevels\tmaximum number of changes that can be undone") call append("$", "\t(global or local to buffer)") call append("$", " \tset ul=" . &ul) +call append("$", "undofile\tautomatically save and restore undo history") +call <SID>BinOptionG("udf", &udf) +call append("$", "undodir\tlist of directories for undo files") +call <SID>OptionG("udir", &udir) call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload") call append("$", " \tset ur=" . &ur) call append("$", "modified\tchanges have been made and not written to a file") @@ -1032,10 +1036,6 @@ if has("vertsplit") call append("$", "cmdwinheight\theight of the command-line window") call <SID>OptionG("cwh", &cwh) endif -call append("$", "undofile\tautomatically save and restore undo history") -call <SID>BinOptionG("udf", &udf) -call append("$", "undodir\tlist of directories for undo files") -call <SID>OptionG("udir", &udir) call <SID>Header("executing external commands") diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim index c53dde8ceb..17cba123a8 100644 --- a/runtime/vimrc_example.vim +++ b/runtime/vimrc_example.vim @@ -19,6 +19,12 @@ inoremap <C-U> <C-G>u<C-U> " Switch syntax highlighting on syntax on +" Also switch on highlighting the last used search pattern. +set hlsearch + +" I like highlighting strings inside C comments. +let c_comment_strings=1 + " Enable file type detection. " Use the default filetype settings, so that mail gets 'textwidth' set to 72, " 'cindent' is on in C files, etc. diff --git a/src/nvim/version.c b/src/nvim/version.c index e6ad679f45..f4a81f223b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -677,7 +677,7 @@ static int included_patches[] = { // 1768, // 1767 NA // 1766 NA - // 1765, + 1765, // 1764 NA 1763, // 1762, @@ -729,7 +729,7 @@ static int included_patches[] = { // 1717 NA 1716, // 1715, - // 1714, + 1714, // 1713 NA 1712, // 1711, |