diff --git a/suse.vimrc b/suse.vimrc index 3131199..7054eeb 100644 --- a/suse.vimrc +++ b/suse.vimrc @@ -41,6 +41,11 @@ set backspace=indent,eol,start " enable this for bash compatible behaviour " set wildmode=longest,full +" do timeout on terminal key codes +set ttimeout +" timeout after 100 msec +set timeoutlen=100 + " Try to get the correct main terminal type if &term =~ "xterm" let myterm = "xterm" @@ -110,13 +115,6 @@ if myterm == "xterm" || myterm == "kvt" || myterm == "gnome" map! [D " KP_5 (NumLock off) map! [E - " PageUp/PageDown - map [5~ - map [6~ - map [5;2~ - map [6;2~ - map [5;5~ - map [6;5~ " keys in normal mode map [H 0 map [F $ @@ -130,13 +128,6 @@ if myterm == "xterm" || myterm == "kvt" || myterm == "gnome" map [D h " KP_5 (NumLock off) map [E i - " PageUp/PageDown - map [5~  - map [6~  - map [5;2~  - map [6;2~  - map [5;5~  - map [6;5~  endif " xterm/kvt but with activated keyboard transmit mode. diff --git a/vim-upstream-patches-7.2-022.bz2 b/vim-upstream-patches-7.2-022.bz2 new file mode 100644 index 0000000..51e28ba --- /dev/null +++ b/vim-upstream-patches-7.2-022.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56b016dbd1216b8bc2c3cf962f34532c527d386fba3ef0332425e34e0ff83c81 +size 19293 diff --git a/vim.changes b/vim.changes index 788bdd3..29320a3 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 26 12:45:48 CEST 2008 - mkoenig@suse.de + +- update upstream patches +- fix code exec via K or g] [bnc#427627] +- remove some offending mappings [bnc#406456] +- set timeout [bnc#426682] + ------------------------------------------------------------------- Thu Sep 11 15:29:42 CEST 2008 - mkoenig@suse.de diff --git a/vim.spec b/vim.spec index 02efa88..db6fadc 100644 --- a/vim.spec +++ b/vim.spec @@ -20,7 +20,7 @@ Name: vim Version: 7.2 -Release: 1 +Release: 4 # License: Other uncritical OpenSource License; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi @@ -29,7 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel fdupes gettext-devel gpm gtk2-devel libacl-devel ncurses-devel perl python-devel ruby-devel tcl-devel update-alternatives update-desktop-files # %define pkg_version 7.2 -%define official_ptchlvl 266 +%define official_ptchlvl 022 %define VIM_SUBDIR vim72 %define site_runtimepath /usr/share/vim/site # @@ -74,7 +74,7 @@ Source16: gvim.png Source18: missing-vim-client Source19: gvim.desktop Source99: vim-7.1-rpmlintrc -#Patch0: %{name}-upstream-patches-7.1-%{official_ptchlvl}.patch.bz2 +Patch0: %{name}-upstream-patches-7.2-%{official_ptchlvl}.bz2 Patch1: %{name}-7.0-no_nb.patch Patch4: %{name}-7.0-gvimrc_fontset.patch Patch5: %{name}-7.0-highlight_fstab.patch @@ -281,7 +281,7 @@ Authors: %prep %setup -q -n %{VIM_SUBDIR} -b 1 -b 2 -#%patch +%patch %patch1 -p1 %patch4 -p1 %patch5 -p1 @@ -440,6 +440,9 @@ rm -rf %{buildroot}%{_mandir}/it.ISO8859-1/ rm -rf %{buildroot}%{_mandir}/it.UTF-8/ # and move russian manpages to a place where they can be found mv %{buildroot}%{_mandir}/ru.UTF-8 %{buildroot}%{_mandir}/ru +# remove some c source files +rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.c +rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c # %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang @@ -598,9 +601,9 @@ fi %{_datadir}/vim/%{VIM_SUBDIR}/spell/* %{_datadir}/vim/%{VIM_SUBDIR}/syntax/* %exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/syntax.vim -%{_datadir}/vim/%{VIM_SUBDIR}/tools/blink.c +#%{_datadir}/vim/%{VIM_SUBDIR}/tools/blink.c %{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter.1 -%{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter.c +#%{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter.c %{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter_README.txt %{_datadir}/vim/%{VIM_SUBDIR}/tools/efm_filter.pl %{_datadir}/vim/%{VIM_SUBDIR}/tools/efm_filter.txt @@ -617,7 +620,7 @@ fi %{_datadir}/vim/%{VIM_SUBDIR}/tools/vimspell.sh %{_datadir}/vim/%{VIM_SUBDIR}/tools/vimspell.txt %{_datadir}/vim/%{VIM_SUBDIR}/tools/vim_vs_net.cmd -%{_datadir}/vim/%{VIM_SUBDIR}/tools/xcmdsrv_client.c +#%{_datadir}/vim/%{VIM_SUBDIR}/tools/xcmdsrv_client.c %{_datadir}/vim/%{VIM_SUBDIR}/tutor/* %{_datadir}/vim/%{VIM_SUBDIR}/delmenu.vim %{_datadir}/vim/%{VIM_SUBDIR}/gvimrc_example.vim @@ -662,6 +665,11 @@ fi %endif %changelog +* Fri Sep 26 2008 mkoenig@suse.de +- update upstream patches +- fix code exec via K or g] [bnc#427627] +- remove some offending mappings [bnc#406456] +- set timeout [bnc#426682] * Thu Sep 11 2008 mkoenig@suse.de - update to version 7.2 * bugfixes and security enhancements