lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
6b5549e
To: vim-dev@vim.org
6b5549e
Subject: Patch 7.3.005
6b5549e
Fcc: outbox
6b5549e
From: Bram Moolenaar <Bram@moolenaar.net>
6b5549e
Mime-Version: 1.0
6b5549e
Content-Type: text/plain; charset=UTF-8
6b5549e
Content-Transfer-Encoding: 8bit
6b5549e
------------
6b5549e
6b5549e
Patch 7.3.005
6b5549e
Problem:    Crash when using undotree(). (Christian Brabandt)
6b5549e
Solution:   Increase the list reference count.  Add a test for undotree() 
6b5549e
            (Lech Lorens)
6b5549e
Files:      src/eval.c, src/testdir/Makefile, src/testdir/test61.in
6b5549e
6b5549e
6b5549e
*** ../vim-7.3.004/src/eval.c	2010-08-15 21:57:26.000000000 +0200
6b5549e
--- src/eval.c	2010-09-14 12:43:04.000000000 +0200
6b5549e
***************
6b5549e
*** 7075,7081 ****
6b5549e
  }
6b5549e
  
6b5549e
  /*
6b5549e
!  * Add a list  entry to dictionary "d".
6b5549e
   * Returns FAIL when out of memory and when key already exists.
6b5549e
   */
6b5549e
      int
6b5549e
--- 7075,7081 ----
6b5549e
  }
6b5549e
  
6b5549e
  /*
6b5549e
!  * Add a list entry to dictionary "d".
6b5549e
   * Returns FAIL when out of memory and when key already exists.
6b5549e
   */
6b5549e
      int
6b5549e
***************
6b5549e
*** 7097,7102 ****
6b5549e
--- 7097,7103 ----
6b5549e
  	dictitem_free(item);
6b5549e
  	return FAIL;
6b5549e
      }
6b5549e
+     ++list->lv_refcount;
6b5549e
      return OK;
6b5549e
  }
6b5549e
  
6b5549e
*** ../vim-7.3.004/src/testdir/Makefile	2010-08-15 21:57:29.000000000 +0200
6b5549e
--- src/testdir/Makefile	2010-09-14 12:38:56.000000000 +0200
6b5549e
***************
6b5549e
*** 44,50 ****
6b5549e
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
6b5549e
  
6b5549e
  clean:
6b5549e
! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.pid* viminfo
6b5549e
  
6b5549e
  test1.out: test1.in
6b5549e
  	-rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo
6b5549e
--- 44,50 ----
6b5549e
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
6b5549e
  
6b5549e
  clean:
6b5549e
! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.* viminfo
6b5549e
  
6b5549e
  test1.out: test1.in
6b5549e
  	-rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo
6b5549e
*** ../vim-7.3.004/src/testdir/test61.in	2010-08-15 21:57:29.000000000 +0200
6b5549e
--- src/testdir/test61.in	2010-09-14 12:38:56.000000000 +0200
6b5549e
***************
6b5549e
*** 4,9 ****
6b5549e
--- 4,13 ----
6b5549e
  Also tests :earlier and :later.
6b5549e
  
6b5549e
  STARTTEST
6b5549e
+ :echo undotree().entries
6b5549e
+ ENDTEST
6b5549e
+ 
6b5549e
+ STARTTEST
6b5549e
  :" Delete three characters and undo
6b5549e
  Gx:set ul=100
6b5549e
  x:set ul=100
6b5549e
*** ../vim-7.3.004/src/version.c	2010-09-14 10:55:24.000000000 +0200
6b5549e
--- src/version.c	2010-09-14 12:39:59.000000000 +0200
6b5549e
***************
6b5549e
*** 716,717 ****
6b5549e
--- 716,719 ----
6b5549e
  {   /* Add new patch number below this line */
6b5549e
+ /**/
6b5549e
+     5,
6b5549e
  /**/
6b5549e
6b5549e
-- 
6b5549e
I'm writing a book.  I've got the page numbers done.
6b5549e
6b5549e
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
6b5549e
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
6b5549e
\\\        download, build and distribute -- http://www.A-A-P.org        ///
6b5549e
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///