Up to 9.0.0032; modprobe patch obsolete

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

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 3577949361efddd8dcb38d5f6e880974b4a6ee8e..681a082749bfe76f1448255cae86130a47c12f0b 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -11,7 +11,7 @@
  endif
 @@ -56,3 +53,11 @@ endif " has("autocmd")
  if has('syntax') && has('eval')
-   packadd matchit
+   packadd! matchit
  endif
 +
 +" Use :help colorscheme for info
@@ -21,22 +21,41 @@
 +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>
+--- 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
  
- " In many terminal emulators the mouse works just fine.  By enabling it you
++" 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')
--  set mouse=a
+-  if &term =~ 'xterm'
+-    set mouse=a
+-  else
+-    set mouse=nvi
+-  endif
 -endif
 +"if has('mouse')
-+"  set mouse=a
++"  if &term =~ 'xterm'
++"    set mouse=a
++"  else
++"    set mouse=nvi
++"  endif
 +"endif
  
- " Switch syntax highlighting on when the terminal has colors or when using the
- " GUI (which always has colors).
-@@ -99,7 +99,7 @@ endif " has("autocmd")
+ " 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.
  " Only define it when not defined already.
  " Revert with: ":delcommand DiffOrig".