build with gtk3 by default

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

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 165e8fe1e778c700576ed1f6067b109095b72a9a..3577949361efddd8dcb38d5f6e880974b4a6ee8e 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,12 +1,47 @@
-diff -urN vim61/runtime/vimrc_example.vim vim61.pld/runtime/vimrc_example.vim
---- vim61/runtime/vimrc_example.vim    Wed Jul 18 21:59:50 2001
-+++ vim61.pld/runtime/vimrc_example.vim        Wed Sep  4 17:36:28 2002
-@@ -73,3 +73,8 @@
-     \ endif
+--- vim-7.4.2189/runtime/vimrc_example.vim~    2016-08-09 22:14:05.000000000 +0200
++++ vim-7.4.2189/runtime/vimrc_example.vim     2016-08-09 22:20:44.071303413 +0200
+@@ -26,7 +23,7 @@ else
+   endif
+ endif
  
- endif " has("autocmd")
+-if &t_Co > 2 || has("gui_running")
++if (&t_Co > 2 || has("gui_running")) && filereadable($VIMRUNTIME."/syntax/syntax.vim")
+   " Switch on highlighting the last used search pattern.
+   set hlsearch
+ endif
+@@ -56,3 +53,11 @@ endif " has("autocmd")
+ if has('syntax') && has('eval')
+   packadd matchit
+ endif
 +
-+" ADDED BY PLD.
-+" USE :help colorscheme FOR INFO
++" Use :help colorscheme for info
 +"set background=dark
 +
++" Source a global configuration file if available
++if filereadable("/etc/vim/vimrc.local")
++  source /etc/vim/vimrc.local
++endi
+--- vim-7.4.2189/runtime/defaults.vim~ 2016-08-09 22:14:05.000000000 +0200
++++ vim-7.4.2189/runtime/defaults.vim  2016-08-09 22:26:29.727124083 +0200
+@@ -53,9 +53,9 @@ inoremap <C-U> <C-G>u<C-U>
+ 
+ " In many terminal emulators the mouse works just fine.  By enabling it you
+ " can position the cursor, Visually select and scroll with the mouse.
+-if has('mouse')
+-  set mouse=a
+-endif
++"if has('mouse')
++"  set mouse=a
++"endif
+ 
+ " Switch syntax highlighting on when the terminal has colors or when using the
+ " GUI (which always has colors).
+@@ -99,7 +99,7 @@ endif " has("autocmd")
+ " file it was loaded from, thus the changes you made.
+ " Only define it when not defined already.
+ " Revert with: ":delcommand DiffOrig".
+-if !exists(":DiffOrig")
++if v:progname =~! "vi" && !exists(":DiffOrig")
+   command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
+                 \ | wincmd p | diffthis
+ endif