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)
diff --git a/runtime/gvimrc_example.vim b/runtime/gvimrc_example.vim
index 5a5197e..fa0f685 100644
--- 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 @@
" 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'
diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index 9cb66ee..6d5eac4 100644
--- 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 @@
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.
diff --git a/src/version.c b/src/version.c
index f22af28..d420eba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1714,
+/**/
1713,
/**/
1712,
