Mercurial > vim
changeset 8853:48b4c1c284fb v7.4.1714
commit https://github.com/vim/vim/commit/54f1b7abf8c48b1dd997202258d1d0673ed4bd29
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 5 22:07:04 2016 +0200
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 05 Apr 2016 22:15:05 +0200 |
| parents | ccb4f86ae3e0 |
| children | 183f05a25a5b |
| files | runtime/gvimrc_example.vim runtime/vimrc_example.vim src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/gvimrc_example.vim +++ b/runtime/gvimrc_example.vim @@ -1,8 +1,9 @@ " An example for a gvimrc file. -" The commands in this are executed when the GUI is started. +" The commands in this are executed when the GUI is started, after the vimrc +" has been executed. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last change: 2001 Sep 02 +" Last change: 2016 Apr 05 " " To use it, copy it to " for Unix and OS/2: ~/.gvimrc @@ -27,17 +28,11 @@ map! <S-Insert> <MiddleMouse> " Only do this for Vim version 5.0 and later. if version >= 500 - " I like highlighting strings inside C comments - let c_comment_strings=1 - " Switch on syntax highlighting if it wasn't on yet. if !exists("syntax_on") syntax on endif - " Switch on search pattern highlighting. - set hlsearch - " For Win32 version, have "K" lookup the keyword in a help file "if has("win32") " let winhelpfile='windows.hlp'
--- a/runtime/vimrc_example.vim +++ b/runtime/vimrc_example.vim @@ -1,7 +1,7 @@ " An example for a vimrc file. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last change: 2016 Mar 25 +" Last change: 2016 Apr 05 " " To use it, copy it to " for Unix and OS/2: ~/.vimrc @@ -47,11 +47,16 @@ if has('mouse') set mouse=a endif -" Switch syntax highlighting on, when the terminal has colors -" Also switch on highlighting the last used search pattern. +" Switch syntax highlighting on when the terminal has colors or when using the +" GUI (which always has colors). if &t_Co > 2 || has("gui_running") 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 endif " Only do this part when compiled with support for autocommands.