From 5a242822de6b9db29cd05c3b09ae3916aca13fc80b6f64d469b2c0a2372f06f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 20 Feb 2015 09:59:18 +0000 Subject: [PATCH] - Updated to revision 640, fixes the following problems * When using Insert mode completion combined with autocommands the redo command may not work. * The default conceal character is documented to be a space but it's initially a dash. (Christian Brabandt) * 7.4.592 breaks the netrw plugin, because the autocommands are skipped. * Marks are not restored after redo + undo. * If no NL or CR is found in the first block of a file then the 'fileformat' may be set to "mac". (Issue 77) * A search with end offset gets stuck at end of file. (Gary Johnson) * Incorrectly read the number of buffer for which an autocommand should be registered. * Can't build with Lua 5.3 on Windows. * Combination of linebreak and conceal doesn't work well. * After deleting characters in Insert mode such that lines are joined undo does not work properly. (issue 324) OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=258 --- _service | 4 ++-- vim-7.4.629.hg.6606.tar.xz | 3 --- vim-7.4.640.hg.6629.tar.xz | 3 +++ vim.changes | 20 ++++++++++++++++++++ vim.spec | 27 +++++---------------------- 5 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 vim-7.4.629.hg.6606.tar.xz create mode 100644 vim-7.4.640.hg.6629.tar.xz diff --git a/_service b/_service index e7eac70..0e7ad05 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ hg https://code.google.com/p/vim vim - 7.4.629.hg - v7-4-629 + 7.4.640.hg + v7-4-640 xz diff --git a/vim-7.4.629.hg.6606.tar.xz b/vim-7.4.629.hg.6606.tar.xz deleted file mode 100644 index 71f4841..0000000 --- a/vim-7.4.629.hg.6606.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31fc60240787ebe1c132ec7931d08733fa74d0ca0edcd3fcb59c91cbd001296f -size 7785992 diff --git a/vim-7.4.640.hg.6629.tar.xz b/vim-7.4.640.hg.6629.tar.xz new file mode 100644 index 0000000..e7492d9 --- /dev/null +++ b/vim-7.4.640.hg.6629.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22ef8f2a1322aaf3400b2e3af14ab11a3bf189f344f152c66b3d726f735827ff +size 7785896 diff --git a/vim.changes b/vim.changes index 3640fc1..2c907d1 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Feb 20 09:49:43 UTC 2015 - idonmez@suse.com + +- Updated to revision 640, fixes the following problems + * When using Insert mode completion combined with autocommands the + redo command may not work. + * The default conceal character is documented to be a space but it's + initially a dash. (Christian Brabandt) + * 7.4.592 breaks the netrw plugin, because the autocommands are + skipped. + * Marks are not restored after redo + undo. + * If no NL or CR is found in the first block of a file then the + 'fileformat' may be set to "mac". (Issue 77) + * A search with end offset gets stuck at end of file. (Gary Johnson) + * Incorrectly read the number of buffer for which an autocommand should be registered. + * Can't build with Lua 5.3 on Windows. + * Combination of linebreak and conceal doesn't work well. + * After deleting characters in Insert mode such that lines are + joined undo does not work properly. (issue 324) + ------------------------------------------------------------------- Wed Feb 11 11:42:11 UTC 2015 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index cc1048d..d97c27e 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 7.4 -%define patchlevel 629 -%define revision 6606 +%define patchlevel 640 +%define revision 6629 %define VIM_SUBDIR vim74 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} @@ -26,12 +26,11 @@ Name: vim Version: 7.4.%{patchlevel}.hg.%{revision} Release: 0 -BuildRequires: db-devel -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes -%endif BuildRequires: autoconf +BuildRequires: db-devel +BuildRequires: fdupes BuildRequires: gettext-devel +BuildRequires: gpm-devel BuildRequires: gtk2-devel %if 0%{?suse_version} > 1200 BuildRequires: pkgconfig(xt) @@ -48,17 +47,9 @@ BuildRequires: python3-devel BuildRequires: rsvg-view BuildRequires: ruby-devel BuildRequires: update-desktop-files -# BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1130 -BuildRequires: gpm-devel -%else -BuildRequires: gpm -%endif -# PreReq: fileutils PreReq: sh-utils -# Provides: vi Provides: vim-base = %{version}-%{release} Provides: vim-enhanced = %{version}-%{release} @@ -67,14 +58,10 @@ Obsoletes: vim-base < %{version}-%{release} Obsoletes: vim-enhanced < %{version}-%{release} Obsoletes: vim-python < %{version}-%{release} Provides: vim_client -# -%if 0%{?suse_version} >= 1010 Recommends: vim-data = %{version}-%{release} -%endif Summary: Vi IMproved License: Vim Group: Productivity/Editors/Vi -# Url: http://www.vim.org/ Source: vim-%{version}.tar.xz Source3: suse.vimrc @@ -125,9 +112,7 @@ For SUSE Linux, Vim is used as /usr/bin/vi. %package data Summary: Vi IMproved Group: Productivity/Editors/Vi -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif # Used to be in vim-plugins package Obsoletes: vim-plugin-matchit <= 1.13.2 Provides: vim-plugin-matchit = 1.13.2 @@ -339,11 +324,9 @@ rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c # Create ghost files (see vim.conf) mkdir -p %{buildroot}/var/run/vi.recover -%if 0%{?suse_version} > 1020 %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin -%endif %check # Reset the terminal scrolling region left behind by the testsuite