update patch status

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

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 430a46ef243b215270770d5e8edefcdd3a583c34..7d858c102e93c93f1e2c8283c6965c1a9aecff51 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,6 +1,16 @@
---- 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 @@
+--- 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
+ 
++" use compressed docs, see :help gzip-helpfile
++set helpfile=$VIMRUNTIME/doc/help.txt.gz
++
+ " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
+ " let &guioptions = substitute(&guioptions, "t", "", "g")
+ 
+@@ -42,13 +45,13 @@
  inoremap <C-U> <C-G>u<C-U>
  
  " In many terminal emulators the mouse works just fine, thus enable it.
@@ -18,12 +28,23 @@
    syntax on
    set hlsearch
  endif
-@@ -93,4 +93,7 @@
+@@ -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