diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2016-10-04 23:09:41 +0900 |
|---|---|---|
| committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2016-10-04 23:14:47 +0900 |
| commit | c3990ba0e6fdc24bda029d55cd74ce00eda85b10 (patch) | |
| tree | d2bbc3f6c26393e843b7172969ec8fcf2f4dadc8 | |
| parent | eeec0cab584864ea2dbd3e9fe9e4a9d6a69dbff8 (diff) | |
| download | rneovim-c3990ba0e6fdc24bda029d55cd74ce00eda85b10.tar.gz rneovim-c3990ba0e6fdc24bda029d55cd74ce00eda85b10.tar.bz2 rneovim-c3990ba0e6fdc24bda029d55cd74ce00eda85b10.zip | |
vim-patch:7.4.1714
Problem: Non-GUI specific settings in the gvimrc_example file.
Solution: Move some settings to the vimrc_example file. Remove setting
'hlsearch' again. (suggested by Hirohito Higashi)
https://github.com/vim/vim/commit/54f1b7abf8c48b1dd997202258d1d0673ed4bd29
| -rw-r--r-- | runtime/vimrc_example.vim | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
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 302e78cb6c..23cac97615 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -729,7 +729,7 @@ static int included_patches[] = { // 1717 NA 1716, // 1715, - // 1714, + 1714, // 1713 NA 1712, // 1711, |