remove downstream patch vim-8.0-copypaste.patch

The patch used to remove 'new' (since 2017) mouse behavior in Vim, which
is applied only if user vimrc (~/.vimrc) doesn't exist. The patch
removal puts the behavior new behavior back.

Block copying with new mouse behavior is done by Shift+(mark the text
with mouse). For pasting in Vim enter insert mode and press
Shift+Insert, or for pasting in other terminal click on middle mouse
button.

The new behavior can be bypassed by creating user .vimrc or setting
skip_defaults_vim, see ':help defaults.vim' in Vim.
This commit is contained in:
Zdenek Dohnal 2021-09-23 14:35:23 +02:00
parent 17a8502ba1
commit 1ec0e33929
2 changed files with 4 additions and 25 deletions

View File

@ -1,22 +0,0 @@
diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim
--- vim82/runtime/defaults.vim.copypaste 2020-10-06 17:03:19.276066889 +0200
+++ vim82/runtime/defaults.vim 2020-10-06 17:04:30.437448603 +0200
@@ -73,18 +73,6 @@ map Q gq
" Revert with ":iunmap <C-U>".
inoremap <C-U> <C-G>u<C-U>
-" In many terminal emulators the mouse works just fine. By enabling it you
-" 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
-
" Only do this part when Vim was compiled with the +eval feature.
if 1

View File

@ -29,7 +29,7 @@ Summary: The VIM editor
URL: http://www.vim.org/
Name: vim
Version: %{baseversion}.%{patchlevel}
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 2
License: Vim and MIT
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@ -66,7 +66,6 @@ Patch3010: vim-7.3-manpage-typo-668894-675480.patch
Patch3011: vim-manpagefixes-948566.patch
Patch3013: vim-7.4-globalsyntax.patch
Patch3014: vim-7.4-releasestring-1318991.patch
Patch3016: vim-8.0-copy-paste.patch
# migrate shebangs in script to /usr/bin/python3 and use python2 when necessary
Patch3017: vim-python3-tests.patch
# fips warning
@ -329,7 +328,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3011 -p1
%patch3013 -p1
%patch3014 -p1
%patch3016 -p1 -b .copypaste
%patch3017 -p1 -b .python-tests
%patch3018 -p1 -b .fips-warning
@ -904,6 +902,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%endif
%changelog
* Thu Sep 23 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-2
- remove downstream patch vim-8.0-copypaste.patch - put mouse settings into defaults.vim again
* Mon Sep 06 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-1
- patchlevel 3404