Accepting request 285613 from editors

- Updated to revision 629, fixes the following problems
  * For complicated list and dict use the garbage collector can run
    out of stack space.
  * Syntax error.
  * The NFA engine does not implement the 'redrawtime' time limit.
  * Vim hangs when freeing a lot of objects.
  * Wrong ":argdo" range does not cause an error.
  * luaV_setref() is missing a return statement. (Ozaki Kiichi)
  * luaV_setref() not returning the correct value.
  * Compiler warning for unitinialized variable. (Tony Mechelynck)
  * Returning 1 in the wrong function. (Raymond Ko)
  * Compiler warning for unused argument.
  * Crash with pattern: \(\)\{80000}  (Dominique Pelle)
  * May leak memory or crash when vim_realloc() returns NULL.
  * Possible NULL pointer dereference.
  * The last screen cell is not updated.
  * Compiler warning for variable might be clobbered by longjmp.
  * Coverity warning for Out-of-bounds read. 
- Remove vim-speedup-gc.patch, fixed upstream

- Updated to revision 608, fixes the following problems
  * Compiler warnings for unitinialized variables. (John Little)
  * Can't match "%>80v" properly. (Axel Bender)
  * Range for :bdelete does not work. (Ronald Schild)
  * Parallel building of the documentation html files is not reliable. 
  * Conceal does not work properly with 'linebreak'. (cs86661)
  * ":0argedit foo" puts the new argument in the second place instead
    of the first.
  * Using ctrl_x_mode as if it contains flags.
  * test_listlbr_utf8 fails when the conceal feature is not available.

OBS-URL: https://build.opensuse.org/request/show/285613
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=149

_service

@@ -3,8 +3,8 @@
         <param name="scm">hg</param>
         <param name="url">https://code.google.com/p/vim</param>
         <param name="filename">vim</param>
-        <param name="versionprefix">7.4.580.hg</param>
+        <param name="versionprefix">7.4.629.hg</param>
-        <param name="revision">v7-4-580</param>
+        <param name="revision">v7-4-629</param>
     </service>
     <service name="recompress" mode="disabled">
         <param name="compression">xz</param>

vim-7.4.580.hg.6506.tar.xz

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

vim-7.4.629.hg.6606.tar.xz

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

vim-speedup-gc.patch

@@ -1,76 +0,0 @@
-Index: vim-7.4.580.hg.6506/src/eval.c
-===================================================================
---- vim-7.4.580.hg.6506.orig/src/eval.c
-+++ vim-7.4.580.hg.6506/src/eval.c
-@@ -6927,48 +6927,51 @@ garbage_collect()
- free_unref_items(copyID)
-     int copyID;
- {
--    dict_T	*dd;
--    list_T	*ll;
-+    dict_T	*dd, *dd_next;
-+    list_T	*ll, *ll_next;
-     int		did_free = FALSE;
- 
-     /*
-      * Go through the list of dicts and free items without the copyID.
-      */
--    for (dd = first_dict; dd != NULL; )
-+    for (dd = first_dict; dd != NULL; ) {
- 	if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
- 	{
- 	    /* Free the Dictionary and ordinary items it contains, but don't
- 	     * recurse into Lists and Dictionaries, they will be in the list
- 	     * of dicts or list of lists. */
-+        dd_next = dd->dv_used_next;
- 	    dict_free(dd, FALSE);
- 	    did_free = TRUE;
--
--	    /* restart, next dict may also have been freed */
--	    dd = first_dict;
-+	    dd = dd_next;
- 	}
--	else
-+	else {
- 	    dd = dd->dv_used_next;
-+    }
-+    }
- 
-     /*
-      * Go through the list of lists and free items without the copyID.
-      * But don't free a list that has a watcher (used in a for loop), these
-      * are not referenced anywhere.
-      */
--    for (ll = first_list; ll != NULL; )
-+    for (ll = first_list; ll != NULL; ) {
- 	if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)
- 						      && ll->lv_watch == NULL)
- 	{
- 	    /* Free the List and ordinary items it contains, but don't recurse
- 	     * into Lists and Dictionaries, they will be in the list of dicts
- 	     * or list of lists. */
-+
-+        ll_next = ll->lv_used_next;
- 	    list_free(ll, FALSE);
- 	    did_free = TRUE;
--
--	    /* restart, next list may also have been freed */
--	    ll = first_list;
-+	    ll = ll_next;
- 	}
--	else
-+	else {
- 	    ll = ll->lv_used_next;
-+    }
-+    }
- 
-     return did_free;
- }
-@@ -7125,6 +7128,7 @@ dict_free(d, recurse)
- 
-     /* Lock the hashtab, we don't want it to resize while freeing items. */
-     hash_lock(&d->dv_hashtab);
-+    assert(d->dv_hashtab.ht_locked > 0);
-     todo = (int)d->dv_hashtab.ht_used;
-     for (hi = d->dv_hashtab.ht_array; todo > 0; ++hi)
-     {

vim.changes

@@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Wed Feb 11 11:42:11 UTC 2015 - idonmez@suse.com
+
+- Updated to revision 629, fixes the following problems
+  * For complicated list and dict use the garbage collector can run
+    out of stack space.
+  * Syntax error.
+  * The NFA engine does not implement the 'redrawtime' time limit.
+  * Vim hangs when freeing a lot of objects.
+  * Wrong ":argdo" range does not cause an error.
+  * luaV_setref() is missing a return statement. (Ozaki Kiichi)
+  * luaV_setref() not returning the correct value.
+  * Compiler warning for unitinialized variable. (Tony Mechelynck)
+  * Returning 1 in the wrong function. (Raymond Ko)
+  * Compiler warning for unused argument.
+  * Crash with pattern: \(\)\{80000}  (Dominique Pelle)
+  * May leak memory or crash when vim_realloc() returns NULL.
+  * Possible NULL pointer dereference.
+  * The last screen cell is not updated.
+  * Compiler warning for variable might be clobbered by longjmp.
+  * Coverity warning for Out-of-bounds read. 
+- Remove vim-speedup-gc.patch, fixed upstream
+
+-------------------------------------------------------------------
+Mon Feb  2 13:17:21 UTC 2015 - idonmez@suse.com
+
+- Updated to revision 608, fixes the following problems
+  * Compiler warnings for unitinialized variables. (John Little)
+  * Can't match "%>80v" properly. (Axel Bender)
+  * Range for :bdelete does not work. (Ronald Schild)
+  * Parallel building of the documentation html files is not reliable. 
+  * Conceal does not work properly with 'linebreak'. (cs86661)
+  * ":0argedit foo" puts the new argument in the second place instead
+    of the first.
+  * Using ctrl_x_mode as if it contains flags.
+  * test_listlbr_utf8 fails when the conceal feature is not available.
+  * When doing ":e foobar" when already editing "foobar" and 'buftype'
+    is "nofile" the buffer is cleared. (Xavier de Gaye)
+  * Crash when searching for "x\{0,90000}". (Dominique Pelle)
+  * Using a block delete while 'breakindent' is set does not work
+    properly.
+  * The test_command_count test fails when using Japanese.
+  * Tiny build doesn't compile.  (Ike Devolder)
+  * Cannot change the result of systemlist().
+  * Out-of-memory error.
+  * Memory wasted in struct because of aligning.
+  * It is not possible to have feedkeys() insert characters.
+  * ":set" does not accept hex numbers as documented.
+  * 'foldcolumn' may be set such that it fills the whole window, not
+    leaving space for text.
+  * Running tests changes viminfo.
+  * The # register is not writable, it cannot be restored after
+    jumping around.
+  * May crash when using a small window.
+  * Compiler warnings for unused variables. 
+
 -------------------------------------------------------------------
 Fri Jan 30 09:45:18 UTC 2015 - idonmez@suse.com
 

vim.spec

@@ -17,8 +17,8 @@
 
 
 %define pkg_version 7.4
-%define patchlevel 580
+%define patchlevel 629
-%define revision 6506
+%define revision 6606
 %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}
@@ -105,7 +105,6 @@ Patch18:        %{name}-7.3-filetype_spec.patch
 Patch19:        %{name}-7.3-diff_check.patch
 Patch21:        %{name}-7.3-filetype_changes.patch
 Patch22:        %{name}-7.4-filetype_mine.patch
-Patch23:        %{name}-speedup-gc.patch
 Patch100:       vim-7.1.314-CVE-2009-0316-debian.patch
 Patch101:       vim73-no-static-libpython.patch
 %{perl_requires}
@@ -188,7 +187,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch19 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
 %patch100 -p1
 %patch101
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .