- up to 7.4.1943

[packages/vim.git] / vim-vimrc.patch

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 7d858c102e93c93f1e2c8283c6965c1a9aecff51..f0aa1b049c41061c6d32294aac31dc8a83a4c8db 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -10,7 +10,7 @@
  " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
  " let &guioptions = substitute(&guioptions, "t", "", "g")
  
-@@ -42,13 +45,13 @@
+@@ -46,13 +46,13 @@ map Q gq
  inoremap <C-U> <C-G>u<C-U>
  
  " In many terminal emulators the mouse works just fine, thus enable it.
@@ -21,13 +21,13 @@
 +"  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")
 +if (&t_Co > 2 || has("gui_running")) && filereadable($VIMRUNTIME."/syntax/syntax.vim")
    syntax on
-   set hlsearch
- endif
+ 
+   " Also switch on highlighting the last used search pattern.
 @@ -93,10 +93,18 @@
  " Convenient command to see the difference between the current buffer and the
  " file it was loaded from, thus the changes you made.