From 8c86d361870984cdfba54c5fa081dcce915600daa17e9cc1e6927fa05fe4ab45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 27 Apr 2017 13:00:31 +0000 Subject: [PATCH 1/3] - Conflict with old vim versions to fix the upgrade from 12.3 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=438 --- vim.changes | 5 +++++ vim.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/vim.changes b/vim.changes index af02434..cf30e5e 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 27 12:59:53 UTC 2017 - idonmez@suse.com + +- Conflict with old vim versions to fix the upgrade from 12.3 + ------------------------------------------------------------------- Tue Apr 18 10:15:22 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 5c2fc11..2489de9 100644 --- a/vim.spec +++ b/vim.spec @@ -90,6 +90,7 @@ Obsoletes: vim-base < %{version}-%{release} Obsoletes: vim-enhanced < %{version}-%{release} Obsoletes: vim-python < %{version}-%{release} Provides: vim_client +Conflicts: vim < 8.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?libperl_requires} %if 0%{?suse_version} > 1200 @@ -128,6 +129,7 @@ Obsoletes: gvim-enhanced < %{version}-%{release} Provides: gvim_client Provides: vi Provides: vim_client +Conflicts: gvim < 8.0 %description -n gvim Package gvim contains the largest set of features of vim, which is From a46a9550df31bd822620d564b5f24632ca9b745cf76c6135e7363166dc96425c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 27 Apr 2017 13:01:46 +0000 Subject: [PATCH 2/3] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=439 --- vim.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vim.changes b/vim.changes index cf30e5e..616e31f 100644 --- a/vim.changes +++ b/vim.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Thu Apr 27 12:59:53 UTC 2017 - idonmez@suse.com -- Conflict with old vim versions to fix the upgrade from 12.3 +- Conflict with old vim versions to fix the upgrade from 12.3 + boo#1036583 ------------------------------------------------------------------- Tue Apr 18 10:15:22 UTC 2017 - idonmez@suse.com From 63b27f8dfc1a008cfdc257b85ee12f24a0c116f4a25d0bdf857f75bab9d9d78e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 28 Apr 2017 11:00:17 +0000 Subject: [PATCH 3/3] . OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=440 --- suse.vimrc | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++- vim.changes | 5 +++++ vim.spec | 2 +- 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/suse.vimrc b/suse.vimrc index 56fc25f..403dd59 100644 --- a/suse.vimrc +++ b/suse.vimrc @@ -2,7 +2,7 @@ " author: Klaus Franken " author: Werner Fink " author: Florian La Roche -" version: 06/11/2011 +" version: 2017/04/28 " commented lines start with `"' function! SKEL_spec() @@ -110,6 +110,24 @@ if myterm == "xterm" || myterm == "kvt" || myterm == "gnome" map! Os 3 map! Op 0 map! On . + " 8bit control characters + map! o : + map! j * + map! m - + map! k + + map! l , + map! M + map! w 7 + map! x 8 + map! y 9 + map! t 4 + map! u 5 + map! v 6 + map! q 1 + map! r 2 + map! s 3 + map! p 0 + map! n . " keys in normal mode map Oo : map Oj * @@ -128,6 +146,24 @@ if myterm == "xterm" || myterm == "kvt" || myterm == "gnome" map Os 3 map Op 0 map On . + " 8bit control characters + map o : + map j * + map m - + map k + + map l , + map M + map w 7 + map x 8 + map y 9 + map t 4 + map u 5 + map v 6 + map q 1 + map r 2 + map s 3 + map p 0 + map n . endif " xterm but without activated keyboard transmit mode @@ -136,6 +172,8 @@ if myterm == "xterm" || myterm == "kvt" || myterm == "gnome" " keys in insert/command mode. map! [H map! [F + map! H + map! F " Home/End: older xterms do not fit termcap/terminfo. map! [1~ map! [4~ @@ -144,11 +182,22 @@ if myterm == "xterm" || myterm == "kvt" || myterm == "gnome" map! [B map! [C map! [D + " 8bit control characters + map! A + map! B + map! C + map! D + map! 5~ + map! 6~ + map! 2~ + map! 3~ " KP_5 (NumLock off) map! [E " keys in normal mode map [H 0 map [F $ + map H 0 + map F $ " Home/End: older xterms do not fit termcap/terminfo. map [1~ 0 map [4~ $ @@ -157,8 +206,18 @@ if myterm == "xterm" || myterm == "kvt" || myterm == "gnome" map [B j map [C l map [D h + " 8bit control characters + map A k + map B j + map C l + map D h + map 5~ + map 6~ + map 2~ + map 3~ " KP_5 (NumLock off) map [E i + map E i endif " xterm/kvt but with activated keyboard transmit mode. diff --git a/vim.changes b/vim.changes index 616e31f..4c7625a 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 28 10:58:31 UTC 2017 - werner@suse.de + +- Extend vimrc with mappings for 8-bit controls key escape sequences + ------------------------------------------------------------------- Thu Apr 27 12:59:53 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 2489de9..5f8765c 100644 --- a/vim.spec +++ b/vim.spec @@ -106,8 +106,8 @@ file name completion, block operations, and editing of binary data. %package data Summary: Vi IMproved -# Used to be in vim-plugins package Group: Productivity/Editors/Vi +# Used to be in vim-plugins package Obsoletes: vim-plugin-matchit <= 1.13.2 Provides: vim-plugin-matchit = 1.13.2 BuildArch: noarch