- rebuild with ruby 2.4

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

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index f0aa1b049c41061c6d32294aac31dc8a83a4c8db..3577949361efddd8dcb38d5f6e880974b4a6ee8e 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,19 +1,32 @@
---- 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
+--- 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
  
-+" use compressed docs, see :help gzip-helpfile
-+set helpfile=$VIMRUNTIME/doc/help.txt.gz
+-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
 +
- " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
- " let &guioptions = substitute(&guioptions, "t", "", "g")
- 
-@@ -46,13 +46,13 @@ map Q gq
- inoremap <C-U> <C-G>u<C-U>
++" 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
@@ -23,28 +36,12 @@
  
  " Switch syntax highlighting on when the terminal has colors or when using the
  " GUI (which always has colors).
--if &t_Co > 2 || has("gui_running")
-+if (&t_Co > 2 || has("gui_running")) && filereadable($VIMRUNTIME."/syntax/syntax.vim")
-   syntax on
- 
-   " Also switch on highlighting the last used search pattern.
-@@ -93,10 +93,18 @@
- " Convenient command to see the difference between the current buffer and the
+@@ -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
-+
-+" 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