From 99995c519305634ee2345ac229b636ec9ef28707 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Oct 30 2019 10:00:38 +0000 Subject: - patchlevel 2234 --- diff --git a/.gitignore b/.gitignore index 0daf9e7..3a8a02d 100644 --- a/.gitignore +++ b/.gitignore @@ -272,3 +272,4 @@ /vim-8.1-2168.tar.bz2 /vim-8.1-2197.tar.bz2 /vim-8.1-2198.tar.bz2 +/vim-8.1-2234.tar.bz2 diff --git a/sources b/sources index 665b8b1..b096f72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2198.tar.bz2) = 11ce62fa2f8c2fbb412c188b6bc3419edb9449d96b6a85e688053b1fcd8460a636e758feea479a0346e98ac35fdf6cb33c336eef94f6210bacecb9d5732d870f +SHA512 (vim-8.1-2234.tar.bz2) = 895650c52f6151d13012c229abd599979cb0b542372b8e012a6ad9b776651b77bdba42d92cf229ab29ec4de4ba2a8ecc69265f1085e928492564a64ec76da3ab diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index 5cb1a88..1ef4c9b 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,14 +1,20 @@ -diff -up vim80/runtime/defaults.vim.copy-paste vim80/runtime/defaults.vim ---- vim80/runtime/defaults.vim.copy-paste 2016-12-19 09:01:20.351119199 +0100 -+++ vim80/runtime/defaults.vim 2016-12-19 09:01:53.735738941 +0100 -@@ -64,12 +64,6 @@ map Q gq +diff -up vim81/runtime/defaults.vim.copypaste vim81/runtime/defaults.vim +--- vim81/runtime/defaults.vim.copypaste 2019-10-30 10:30:23.108710252 +0100 ++++ vim81/runtime/defaults.vim 2019-10-30 10:36:19.127508406 +0100 +@@ -73,18 +73,6 @@ map Q gq " Revert with ":iunmap ". inoremap 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') -- 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 diff --git a/vim.spec b/vim.spec index f7931e0..6424da7 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2198 +%define patchlevel 2234 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -249,7 +249,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3011 -p1 %patch3013 -p1 %patch3014 -p1 -%patch3016 -p1 +%patch3016 -p1 -b .copypaste %patch3017 -p1 %patch3018 -p1 @@ -649,6 +649,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(sk.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/sk.cp1250 %lang(sr) %{_datadir}/%{name}/%{vimdir}/lang/sr %lang(sv) %{_datadir}/%{name}/%{vimdir}/lang/sv +%lang(tr) %{_datadir}/%{name}/%{vimdir}/lang/tr %lang(uk) %{_datadir}/%{name}/%{vimdir}/lang/uk %lang(uk.cp1251) %{_datadir}/%{name}/%{vimdir}/lang/uk.cp1251 %lang(vi) %{_datadir}/%{name}/%{vimdir}/lang/vi @@ -796,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Oct 30 2019 Zdenek Dohnal - 2:8.1.2234-1 +- patchlevel 2234 + * Tue Oct 22 2019 Zdenek Dohnal - 2:8.1.2198-1 - patchlevel 2198