update patch status

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

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index c9068bec9b1706ced8bb49a2b550010e131bb910..7d858c102e93c93f1e2c8283c6965c1a9aecff51 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,5 +1,5 @@
---- vim73/runtime/vimrc_example.vim~   2010-05-15 14:03:57.000000000 +0300
-+++ vim73/runtime/vimrc_example.vim    2011-01-02 22:53:43.246560000 +0200
+--- vim74/runtime/vimrc_example.vim~   2013-09-06 00:10:56.000000000 +0300
++++ vim74/runtime/vimrc_example.vim    2013-09-06 00:11:24.756404306 +0300
 @@ -31,6 +31,9 @@
  set showcmd           " display incomplete commands
  set incsearch         " do incremental searching
@@ -28,15 +28,23 @@
    syntax on
    set hlsearch
  endif
-@@ -90,7 +93,10 @@
+@@ -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.
  " Only define it when not defined already.
 -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
++
++" Source a global configuration file if available
++if filereadable("/etc/vim/vimrc.local")
++  source /etc/vim/vimrc.local
++endif
+ 
+ if has('langmap') && exists('+langnoremap')
+   " Prevent that the langmap option applies to characters that result from a