X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=vim-vimrc.patch;h=3577949361efddd8dcb38d5f6e880974b4a6ee8e;hb=4e453333239436825acca6980232d950c2abda03;hp=430a46ef243b215270770d5e8edefcdd3a583c34;hpb=222a81c0bf30ecd50b09833f413e9ffdbae44b14;p=packages%2Fvim.git

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 430a46e..3577949 100644
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,9 +1,32 @@
---- vim72/runtime/vimrc_example.vim	2008-08-18 13:33:06.007243535 +0300
-+++ vim72/runtime/vimrc_example.vim	2009-05-14 02:04:43.261671071 +0300
-@@ -42,13 +42,13 @@
- inoremap <C-U> <C-G>u<C-U>
+--- 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
+ 
+-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
++
++" 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, thus enable it.
+ " 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
@@ -11,19 +34,14 @@
 +"  set mouse=a
 +"endif
  
- " Switch syntax highlighting on, when the terminal has colors
- " Also switch on highlighting the last used search pattern.
--if &t_Co > 2 || has("gui_running")
-+if (&t_Co > 2 || has("gui_running")) && filereadable($VIMRUNTIME."/syntax/syntax.vim")
-   syntax on
-   set hlsearch
- endif
-@@ -93,4 +93,7 @@
+ " 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 # | 0d_ | diffthis
+   command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
  		  \ | wincmd p | diffthis
  endif
-+
-+" Use :help colorscheme for info
-+"set background=dark