aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 7.4.1714

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2016-04-05 22:07:04 +02:00
parent f80663f17b
commit 54f1b7abf8
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/gvimrc_example.vim
View File

@@ -1,8 +1,9 @@
" An example for a gvimrc file. " 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> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last change: 2001 Sep 02 " Last change: 2016 Apr 05
" "
" To use it, copy it to " To use it, copy it to
" for Unix and OS/2: ~/.gvimrc " for Unix and OS/2: ~/.gvimrc
@@ -27,17 +28,11 @@ map! <S-Insert> <MiddleMouse>
" Only do this for Vim version 5.0 and later. " Only do this for Vim version 5.0 and later.
if version >= 500 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. " Switch on syntax highlighting if it wasn't on yet.
if !exists("syntax_on") if !exists("syntax_on")
syntax on syntax on
endif endif
" Switch on search pattern highlighting.
set hlsearch
" For Win32 version, have "K" lookup the keyword in a help file " For Win32 version, have "K" lookup the keyword in a help file
"if has("win32") "if has("win32")
" let winhelpfile='windows.hlp' " let winhelpfile='windows.hlp'

11
runtime/vimrc_example.vim
View File

@@ -1,7 +1,7 @@
" An example for a vimrc file. " An example for a vimrc file.
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last change: 2016 Mar 25 " Last change: 2016 Apr 05
" "
" To use it, copy it to " To use it, copy it to
" for Unix and OS/2: ~/.vimrc " for Unix and OS/2: ~/.vimrc
@@ -47,11 +47,16 @@ if has('mouse')
set mouse=a set mouse=a
endif endif
" Switch syntax highlighting on, when the terminal has colors " Switch syntax highlighting on when the terminal has colors or when using the
" Also switch on highlighting the last used search pattern. " GUI (which always has colors).
if &t_Co > 2 || has("gui_running") if &t_Co > 2 || has("gui_running")
syntax on syntax on
" Also switch on highlighting the last used search pattern.
set hlsearch set hlsearch
" I like highlighting strings inside C comments.
let c_comment_strings=1
endif endif
" Only do this part when compiled with support for autocommands. " Only do this part when compiled with support for autocommands.

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1714,
/**/ /**/
1713, 1713,
/**/ /**/