From 95f20e394b1b662dc77691d1e0ac2bb709b1e047 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 2 Nov 2019 15:57:49 +0100 Subject: [PATCH] - up to 8.1.2238 --- desktop.patch | 8 ++++---- vim-vimrc.patch | 18 +++++++++++++----- vim.spec | 6 +++--- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/desktop.patch b/desktop.patch index dbe9c32..1a801b4 100644 --- a/desktop.patch +++ b/desktop.patch @@ -12,8 +12,8 @@ +++ vim-7.4.979/gvim-athena.desktop 2015-12-28 08:24:02.106735918 +0200 @@ -1,5 +1,5 @@ # Translators: This is the Application Name used in the GVim desktop file - Name[de]=GVim Name[eo]=GVim + Name[tr]=GVim -Name=GVim +Name=GVim Athena # Translators: This is the Generic Application Name used in the Vim desktop file @@ -33,8 +33,8 @@ +++ vim-7.4.979/gvim-gnome.desktop 2015-12-28 08:33:14.285396908 +0200 @@ -1,5 +1,5 @@ # Translators: This is the Application Name used in the GVim desktop file - Name[de]=GVim Name[eo]=GVim + Name[tr]=GVim -Name=GVim +Name=GVim GNOME # Translators: This is the Generic Application Name used in the Vim desktop file @@ -77,8 +77,8 @@ +++ vim-7.4.979/gvim-gtk.desktop 2015-12-28 08:29:28.577015888 +0200 @@ -1,5 +1,5 @@ # Translators: This is the Application Name used in the GVim desktop file - Name[de]=GVim Name[eo]=GVim + Name[tr]=GVim -Name=GVim +Name=GVim GTK # Translators: This is the Generic Application Name used in the Vim desktop file @@ -121,8 +121,8 @@ +++ vim-7.4.979/gvim-motif.desktop 2015-12-28 08:31:11.245677767 +0200 @@ -1,5 +1,5 @@ # Translators: This is the Application Name used in the GVim desktop file - Name[de]=GVim Name[eo]=GVim + Name[tr]=GVim -Name=GVim +Name=GVim Motif # Translators: This is the Generic Application Name used in the Vim desktop file diff --git a/vim-vimrc.patch b/vim-vimrc.patch index 3577949..b1b95fd 100644 --- a/vim-vimrc.patch +++ b/vim-vimrc.patch @@ -23,15 +23,23 @@ +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 u - - " In many terminal emulators the mouse works just fine. By enabling it you +@@ -77,13 +77,13 @@ inoremap u " 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 diff --git a/vim.spec b/vim.spec index 1d6d9b9..65d07f6 100644 --- a/vim.spec +++ b/vim.spec @@ -29,8 +29,8 @@ # wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}' # VCS Commits: https://github.com/vim/vim/commits/master -%define ver 8.1.2141 -%define rel 2 +%define ver 8.1.2238 +%define rel 1 Summary: Vi IMproved - a Vi clone Summary(de.UTF-8): VIsual editor iMproved Summary(es.UTF-8): Editor visual incrementado @@ -50,7 +50,7 @@ License: Charityware Group: Applications/Editors/Vim #Source0: ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2 Source0: https://github.com/vim/vim/archive/v%{ver}.tar.gz -# Source0-md5: 168b628c0df82197bed699ce8f97b2d9 +# Source0-md5: 98c01bfec862fdc27367671b9f966508 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f Source2: http://skawina.eu.org/mikolaj/usr_doc_pl.zip -- 2.44.0