- Updated to revision 843, fixes the following problems

* Xxd doesn't have a license notice.
  * The ruler shows "Bot" even when there are only filler lines missing. (Gary Johnson)
  * CTRL-A in Visual mode doesn't work properly with "alpha" in 'nrformat'.
  * After CTRL-V CTRL-A mode isn't updated. (Hirohito Higashi)
  * With a sequence of commands using buffers in diff mode E749 is given. (itchyny)
  * Invalid memory access when using "exe 'sc'".
  * Gcc sanitizer complains about using a NULL pointer to memmove().
  * It is not possible to save and restore character search state.
  * Illegal memory access with "sy match a fold".
  * Invalid memory access when doing ":call g:".
  * Invalid memory access when doing ":fun X(".
  * Invalid memory access in file_pat_to_reg_pat().
  * 'linebreak' breaks c% if the last Visual selection was block. (Chris Morganiser, Issue 389)
  * Invalid memory access in file_pat_to_reg_pat.
  * Cursor moves after CTRL-A on alphabetic character.
  * Invalid memory access for ":syn keyword x a[".
  * Crash when using "syn keyword x c". (Dominique Pelle)
  * Crash when clicking in beval balloon. (Travis Lebsock)
  * Resetting 'encoding' when doing ":set all&" causes problems. (Bjorn Linse) Display is not updated.
  * When expanding `=expr` on the command line and encountering an error, the command is executed anyway.
  * $HOME in `=$HOME . '/.vimrc'` is expanded too early.
  * More side effects of ":set all&" are missing. (Björn Linse)
  * gettabvar() doesn't work after Vim start. (Szymon Wrozynski)
  * Comparing utf-8 sequences does not handle different byte sizes correctly.
  * Can't compile without the crypt feature. (John Marriott)

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=282
This commit is contained in:
Ismail Dönmez 2015-09-01 09:14:52 +00:00 committed by Git OBS Bridge
parent b8f2a0d93c
commit d0af643bdf
5 changed files with 48 additions and 17 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e7e1c5f1b79960efffabe91476a2ebaf842032349c115525d80b2a333d837a4
size 12202826

3
v7.4.843.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee6e6552d42d084d45b85b3202c7e88fdfd5692c6fc495f16ed179fcc7b0a71e
size 12205091

View File

@ -1,6 +1,7 @@
diff -rup vim73.orig/src/diff.c vim73/src/diff.c
--- vim73.orig/src/diff.c 2010-07-31 15:35:21.000000000 +0200
+++ vim73/src/diff.c 2010-11-21 06:17:00.897968023 +0100
Index: vim-7.4.843/src/diff.c
===================================================================
--- vim-7.4.843.orig/src/diff.c
+++ vim-7.4.843/src/diff.c
@@ -42,7 +42,7 @@ static void diff_check_unchanged __ARGS(
static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp));
static void diff_redraw __ARGS((int dofold));
@ -10,7 +11,7 @@ diff -rup vim73.orig/src/diff.c vim73/src/diff.c
static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2));
static int diff_cmp __ARGS((char_u *s1, char_u *s2));
#ifdef FEAT_FOLDING
@@ -664,6 +664,7 @@ ex_diffupdate(eap)
@@ -667,6 +667,7 @@ ex_diffupdate(eap)
char_u *tmp_diff;
FILE *fd;
int ok;
@ -18,7 +19,7 @@ diff -rup vim73.orig/src/diff.c vim73/src/diff.c
int io_error = FALSE;
/* Delete all diffblocks. */
@@ -716,7 +717,7 @@ ex_diffupdate(eap)
@@ -719,7 +720,7 @@ ex_diffupdate(eap)
if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
io_error = TRUE;
fclose(fd);
@ -27,7 +28,7 @@ diff -rup vim73.orig/src/diff.c vim73/src/diff.c
fd = mch_fopen((char *)tmp_diff, "r");
if (fd == NULL)
io_error = TRUE;
@@ -762,6 +763,12 @@ ex_diffupdate(eap)
@@ -765,6 +766,12 @@ ex_diffupdate(eap)
}
#endif
@ -40,8 +41,8 @@ diff -rup vim73.orig/src/diff.c vim73/src/diff.c
/* If we checked if "-a" works already, break here. */
if (diff_a_works != MAYBE)
break;
@@ -796,10 +803,13 @@ ex_diffupdate(eap)
continue;
@@ -808,10 +815,13 @@ ex_diffupdate(eap)
continue; /* skip buffer that isn't loaded */
if (diff_write(buf, tmp_new) == FAIL)
continue;
- diff_file(tmp_orig, tmp_new, tmp_diff);
@ -58,7 +59,7 @@ diff -rup vim73.orig/src/diff.c vim73/src/diff.c
mch_remove(tmp_diff);
mch_remove(tmp_new);
}
@@ -819,13 +829,14 @@ theend:
@@ -831,13 +841,14 @@ theend:
/*
* Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
*/
@ -74,7 +75,7 @@ diff -rup vim73.orig/src/diff.c vim73/src/diff.c
size_t len;
#ifdef FEAT_EVAL
@@ -861,13 +872,14 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
@@ -873,13 +884,14 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
#ifdef FEAT_AUTOCMD
block_autocmds(); /* Avoid ShellCmdPost stuff */
#endif

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Tue Sep 1 09:06:38 UTC 2015 - idonmez@suse.com
- Updated to revision 843, fixes the following problems
* Xxd doesn't have a license notice.
* The ruler shows "Bot" even when there are only filler lines missing. (Gary Johnson)
* CTRL-A in Visual mode doesn't work properly with "alpha" in 'nrformat'.
* After CTRL-V CTRL-A mode isn't updated. (Hirohito Higashi)
* With a sequence of commands using buffers in diff mode E749 is given. (itchyny)
* Invalid memory access when using "exe 'sc'".
* Gcc sanitizer complains about using a NULL pointer to memmove().
* It is not possible to save and restore character search state.
* Illegal memory access with "sy match a fold".
* Invalid memory access when doing ":call g:".
* Invalid memory access when doing ":fun X(".
* Invalid memory access in file_pat_to_reg_pat().
* 'linebreak' breaks c% if the last Visual selection was block. (Chris Morganiser, Issue 389)
* Invalid memory access in file_pat_to_reg_pat.
* Cursor moves after CTRL-A on alphabetic character.
* Invalid memory access for ":syn keyword x a[".
* Crash when using "syn keyword x c". (Dominique Pelle)
* Crash when clicking in beval balloon. (Travis Lebsock)
* Resetting 'encoding' when doing ":set all&" causes problems. (Bjorn Linse) Display is not updated.
* When expanding `=expr` on the command line and encountering an error, the command is executed anyway.
* $HOME in `=$HOME . '/.vimrc'` is expanded too early.
* More side effects of ":set all&" are missing. (Björn Linse)
* gettabvar() doesn't work after Vim start. (Szymon Wrozynski)
* Comparing utf-8 sequences does not handle different byte sizes correctly.
* Can't compile without the crypt feature. (John Marriott)
- Refresh vim-7.3-diff_check.patch
-------------------------------------------------------------------
Wed Jul 29 08:55:32 UTC 2015 - idonmez@suse.com

View File

@ -17,8 +17,7 @@
%define pkg_version 7.4
%define patchlevel 803
%define _rversion 7-4-%patchlevel
%define patchlevel 843
%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}
@ -63,7 +62,7 @@ Summary: Vi IMproved
License: Vim
Group: Productivity/Editors/Vi
Url: http://www.vim.org/
Source: https://github.com/vim/vim/archive/v%{_rversion}.tar.gz
Source: https://github.com/vim/vim/archive/v%{version}.tar.gz
Source3: suse.vimrc
Source4: vimrc_example1
Source5: vimrc_example2
@ -151,7 +150,7 @@ You need package vim for the help and other documentation too. If you
want less features, you might want to install vim instead.
%prep
%setup -q -n %{name}-%{_rversion}
%setup -q -n %{name}-%{version}
%patch3 -p1
%patch4 -p1