update-source: reorganize code into functions

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

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 01d3eacafddaa93c1f6fdde789bfab1f5a613701..7d858c102e93c93f1e2c8283c6965c1a9aecff51 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,12 +1,50 @@
-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
+--- 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
  
- endif " has("autocmd")
++" use compressed docs, see :help gzip-helpfile
++set helpfile=$VIMRUNTIME/doc/help.txt.gz
 +
-+" ADDED BY PLD.
-+" USE :help colorshame FOR INFO
-+set background=dark
+ " 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.
+-if has('mouse')
+-  set mouse=a
+-endif
++"if has('mouse')
++"  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,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 ++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