Up to 9.1.0168

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

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 03c908f9cf6309f53e0fa2236f8d99d621f8f46c..681a082749bfe76f1448255cae86130a47c12f0b 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,22 +1,66 @@
---- vim71/runtime/vimrc_example.vim~   2007-05-13 08:47:25.040494112 +0200
-+++ vim71/runtime/vimrc_example.vim    2007-05-13 08:49:53.405346643 +0200
-@@ -38,7 +38,7 @@
- map Q gq
+--- 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
  
- " In many terminal emulators the mouse works just fine, thus enable it.
--set mouse=a
-+"set mouse=a
+-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:26:29.727124083 +0200
++++ vim-8.2.0241/runtime/defaults.vim  2020-05-13 10:02:53.863204152 +0300
+@@ -68,6 +68,10 @@
+ map Q gq
+ sunmap Q
  
- " Switch syntax highlighting on, when the terminal has colors
- " Also switch on highlighting the last used search pattern.
-@@ -83,5 +83,8 @@
++" Avoid common :X mistype. replace it with :x
++" http://stackoverflow.com/a/17793858
++cnoreabbrev X x
++
+ " CTRL-U in insert mode deletes a lot.  Use CTRL-G u to first break undo,
+ " so that you can undo CTRL-U after inserting a line break.
+ " Revert with ":iunmap <C-U>".
+@@ -77,13 +81,13 @@
+ " can position the cursor, Visually select and scroll with the mouse.
+ " Only xterm can grab the mouse events when using the shift key, for other
+ " terminals use ":", select text and press Esc.
+-if has('mouse')
+-  if &term =~ 'xterm'
+-    set mouse=a
+-  else
+-    set mouse=nvi
+-  endif
+-endif
++"if has('mouse')
++"  if &term =~ 'xterm'
++"    set mouse=a
++"  else
++"    set mouse=nvi
++"  endif
++"endif
  
- " Convenient command to see the difference between the current buffer and the
+ " Only do this part when Vim was compiled with the +eval feature.
+ if 1
+@@ -99,7 +103,7 @@
  " file it was loaded from, thus the changes you made.
-+if v:progname =~! "vi"
- command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
-               \ | wincmd p | diffthis
-+endif
-+
-+" USE :help colorscheme FOR INFO
-+"set background=dark
+ " 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