r1041 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.1.117 upstream/patches/7.1.118 upstream/patches/7.1.119 upstream/patches/7.1.120 upstream/patches/7.1.121 upstream/patches/7.1.122

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Wed Sep 26 13:50:18 UTC 2007


Author: jamessan
Date: Wed Sep 26 13:50:17 2007
New Revision: 1041

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1041
Log:
* New upstream patches (057 - 122), see README.gz for details.

Added:
    trunk/packages/vim/upstream/patches/7.1.117
    trunk/packages/vim/upstream/patches/7.1.118
    trunk/packages/vim/upstream/patches/7.1.119
    trunk/packages/vim/upstream/patches/7.1.120
    trunk/packages/vim/upstream/patches/7.1.121
    trunk/packages/vim/upstream/patches/7.1.122
Modified:
    trunk/packages/vim/debian/README
    trunk/packages/vim/debian/changelog

Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1041&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Sep 26 13:50:17 2007
@@ -145,3 +145,9 @@
   1386  7.1.114  memory leak in getmatches()
   1472  7.1.115  (after 7.1.105) compiler warning for uninitialized variable
   3137  7.1.116  can't display characters above 0x10000
+  1414  7.1.117  can't check wether Vim was compiled with Gnome
+  1805  7.1.118  (after 7.1.107) compiler warning for Visual C compiler
+  1761  7.1.119  crash after setting 'cmdheight' to huge value
+ 17416  7.1.120  can't use valgrind with "make test" to test for memory leaks
+  2350  7.1.121  ":cd %:h" fails when editing file in current directory
+  3732  7.1.122  Mac: building with Aap doesn't work properly

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1041&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Sep 26 13:50:17 2007
@@ -1,7 +1,7 @@
-vim (1:7.1-116+1) UNRELEASED; urgency=low
+vim (1:7.1-122+1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patches (057 - 116), see README.gz for details.
+  * New upstream patches (057 - 122), see README.gz for details.
 
   [ Stefano Zacchiroli ]
   * debian/control
@@ -14,7 +14,7 @@
     "XS-Vcs-*:" fields.
   * Add Homepage field to debian/control.
 
- -- James Vega <jamessan at debian.org>  Fri, 21 Sep 2007 15:36:21 -0400
+ -- James Vega <jamessan at debian.org>  Tue, 25 Sep 2007 22:01:54 -0400
 
 vim (1:7.1-056+2) unstable; urgency=low
 

Added: trunk/packages/vim/upstream/patches/7.1.117
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.117?rev=1041&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.117 (added)
+++ trunk/packages/vim/upstream/patches/7.1.117 Wed Sep 26 13:50:17 2007
@@ -1,0 +1,49 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.117
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.117
+Problem:    Can't check wether Vim was compiled with Gnome. (Tony Mechelynck)
+Solution:   Add gui_gnome to the has() list.
+Files:	    src/eval.c
+
+
+*** ../vim-7.1.116/src/eval.c	Mon Sep 17 22:19:43 2007
+--- src/eval.c	Sun Sep 16 19:24:49 2007
+***************
+*** 10879,10884 ****
+--- 10883,10891 ----
+  	"gui_gtk2",
+  # endif
+  #endif
++ #ifdef FEAT_GUI_GNOME
++ 	"gui_gnome",
++ #endif
+  #ifdef FEAT_GUI_MAC
+  	"gui_mac",
+  #endif
+*** ../vim-7.1.116/src/version.c	Mon Sep 17 22:38:49 2007
+--- src/version.c	Tue Sep 25 12:48:59 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     117,
+  /**/
+
+-- 
+ARTHUR:  No, hang on!  Just answer the five questions ...
+GALAHAD: Three questions ...
+ARTHUR:  Three questions ...  And we shall watch ... and pray.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Added: trunk/packages/vim/upstream/patches/7.1.118
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.118?rev=1041&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.118 (added)
+++ trunk/packages/vim/upstream/patches/7.1.118 Wed Sep 26 13:50:17 2007
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.118
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.118 (after 7.1.107)
+Problem:    Compiler warning for Visual C compiler.
+Solution:   Add typecast. (Mike Williams)
+Files:	    src/ops.c
+
+
+*** ../vim-7.1.117/src/ops.c	Thu Sep 13 22:40:47 2007
+--- src/ops.c	Mon Sep 24 18:30:09 2007
+***************
+*** 2605,2611 ****
+  	/* Auto-indenting may have changed the indent.  If the cursor was past
+  	 * the indent, exclude that indent change from the inserted text. */
+  	firstline = ml_get(oap->start.lnum);
+! 	if (bd.textcol > pre_indent)
+  	{
+  	    long new_indent = (long)(skipwhite(firstline) - firstline);
+  
+--- 2605,2611 ----
+  	/* Auto-indenting may have changed the indent.  If the cursor was past
+  	 * the indent, exclude that indent change from the inserted text. */
+  	firstline = ml_get(oap->start.lnum);
+! 	if (bd.textcol > (colnr_T)pre_indent)
+  	{
+  	    long new_indent = (long)(skipwhite(firstline) - firstline);
+  
+*** ../vim-7.1.117/src/version.c	Tue Sep 25 12:50:00 2007
+--- src/version.c	Tue Sep 25 14:18:37 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     118,
+  /**/
+
+-- 
+BRIDGEKEEPER: What is your favorite editor?
+GAWAIN:       Emacs ...  No, Viiiiiiiiiiimmmmmmm!
+           "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Added: trunk/packages/vim/upstream/patches/7.1.119
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.119?rev=1041&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.119 (added)
+++ trunk/packages/vim/upstream/patches/7.1.119 Wed Sep 26 13:50:17 2007
@@ -1,0 +1,59 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.119
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.119
+Problem:    Crash when 'cmdheight' set to very large value. (A.Politz)
+Solution:   Limit 'cmdheight' to 'lines' minus one.  Store right value of
+	    'cmdheight' when running out of room.
+Files:	    src/option.c, src/window.c
+
+
+*** ../vim-7.1.118/src/option.c	Thu Sep  6 16:33:47 2007
+--- src/option.c	Tue Sep 25 12:17:35 2007
+***************
+*** 7824,7829 ****
+--- 7824,7831 ----
+  	    errmsg = e_positive;
+  	    p_ch = 1;
+  	}
++ 	if (p_ch > Rows - min_rows() + 1)
++ 	    p_ch = Rows - min_rows() + 1;
+  
+  	/* Only compute the new window layout when startup has been
+  	 * completed. Otherwise the frame sizes may be wrong. */
+*** ../vim-7.1.118/src/window.c	Thu Sep 13 18:25:08 2007
+--- src/window.c	Tue Sep 25 12:13:56 2007
+***************
+*** 5523,5528 ****
+--- 5523,5529 ----
+  		{
+  		    EMSG(_(e_noroom));
+  		    p_ch = old_p_ch;
++ 		    curtab->tp_ch_used = p_ch;
+  		    cmdline_row = Rows - p_ch;
+  		    break;
+  		}
+*** ../vim-7.1.118/src/version.c	Tue Sep 25 14:19:35 2007
+--- src/version.c	Tue Sep 25 14:48:14 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     119,
+  /**/
+
+-- 
+Q: Why does /dev/null accept only integers?
+A: You can't sink a float.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Added: trunk/packages/vim/upstream/patches/7.1.120
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.120?rev=1041&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.120 (added)
+++ trunk/packages/vim/upstream/patches/7.1.120 Wed Sep 26 13:50:17 2007
@@ -1,0 +1,558 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.120
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.120
+Problem:    Can't properly check memory leaks while running tests.
+Solution:   Add an argument to garbagecollect().  Delete functions and
+	    variables in the test scripts.
+Files:	    runtime/doc/eval.txt, src/eval.c, src/globals.h, src/main.c,
+	    src/testdir/Makefile, src/testdir/test14.in,
+	    src/testdir/test26.in, src/testdir/test34.in,
+	    src/testdir/test45.in, src/testdir/test47.in,
+	    src/testdir/test49.in, src/testdir/test55.in,
+	    src/testdir/test56.in, src/testdir/test58.in,
+	    src/testdir/test59.in, src/testdir/test60.in,
+	    src/testdir/test60.vim, src/testdir/test62.in,
+	    src/testdir/test63.in, src/testdir/test64.in
+
+
+*** ../vim-7.1.119/runtime/doc/eval.txt	Thu Jul 26 22:55:11 2007
+--- runtime/doc/eval.txt	Tue Sep 25 17:40:30 2007
+***************
+*** 1,4 ****
+! *eval.txt*      For Vim version 7.1.  Last change: 2007 Jul 25
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt*      For Vim version 7.1.  Last change: 2007 Sep 25
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+***************
+*** 1603,1609 ****
+  foldtextresult( {lnum})		String	text for closed fold at {lnum}
+  foreground( )			Number	bring the Vim window to the foreground
+  function( {name})		Funcref reference to function {name}
+! garbagecollect()		none	free memory, breaking cyclic references
+  get( {list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
+  get( {dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
+  getbufline( {expr}, {lnum} [, {end}])
+--- 1603,1609 ----
+  foldtextresult( {lnum})		String	text for closed fold at {lnum}
+  foreground( )			Number	bring the Vim window to the foreground
+  function( {name})		Funcref reference to function {name}
+! garbagecollect( [at_exit])	none	free memory, breaking cyclic references
+  get( {list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
+  get( {dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
+  getbufline( {expr}, {lnum} [, {end}])
+***************
+*** 2673,2679 ****
+  		{name} can be a user defined function or an internal function.
+  
+  
+! garbagecollect()					*garbagecollect()*
+  		Cleanup unused |Lists| and |Dictionaries| that have circular
+  		references.  There is hardly ever a need to invoke this
+  		function, as it is automatically done when Vim runs out of
+--- 2673,2679 ----
+  		{name} can be a user defined function or an internal function.
+  
+  
+! garbagecollect([at_exit])				*garbagecollect()*
+  		Cleanup unused |Lists| and |Dictionaries| that have circular
+  		references.  There is hardly ever a need to invoke this
+  		function, as it is automatically done when Vim runs out of
+***************
+*** 2683,2688 ****
+--- 2683,2691 ----
+  		This is useful if you have deleted a very big |List| and/or
+  		|Dictionary| with circular references in a script that runs
+  		for a long time.
++ 		When the optional "at_exit" argument is one, garbage
++ 		collection will also be done when exiting Vim, if it wasn't
++ 		done before.  This is useful when checking for memory leaks.
+  
+  get({list}, {idx} [, {default}])			*get()*
+  		Get item {idx} from |List| {list}.  When this item is not
+*** ../vim-7.1.119/src/eval.c	Tue Sep 25 12:50:00 2007
+--- src/eval.c	Sun Sep 16 19:24:49 2007
+***************
+*** 6128,6133 ****
+--- 6128,6134 ----
+      /* Only do this once. */
+      want_garbage_collect = FALSE;
+      may_garbage_collect = FALSE;
++     garbage_collect_at_exit = FALSE;
+  
+      /*
+       * 1. Go through all accessible variables and mark all lists and dicts
+***************
+*** 7110,7116 ****
+      {"foldtextresult",	1, 1, f_foldtextresult},
+      {"foreground",	0, 0, f_foreground},
+      {"function",	1, 1, f_function},
+!     {"garbagecollect",	0, 0, f_garbagecollect},
+      {"get",		2, 3, f_get},
+      {"getbufline",	2, 3, f_getbufline},
+      {"getbufvar",	2, 2, f_getbufvar},
+--- 7111,7117 ----
+      {"foldtextresult",	1, 1, f_foldtextresult},
+      {"foreground",	0, 0, f_foreground},
+      {"function",	1, 1, f_function},
+!     {"garbagecollect",	0, 1, f_garbagecollect},
+      {"get",		2, 3, f_get},
+      {"getbufline",	2, 3, f_getbufline},
+      {"getbufvar",	2, 2, f_getbufvar},
+***************
+*** 9719,9724 ****
+--- 9720,9728 ----
+      /* This is postponed until we are back at the toplevel, because we may be
+       * using Lists and Dicts internally.  E.g.: ":echo [garbagecollect()]". */
+      want_garbage_collect = TRUE;
++ 
++     if (argvars[0].v_type != VAR_UNKNOWN && get_tv_number(&argvars[0]) == 1)
++ 	garbage_collect_at_exit = TRUE;
+  }
+  
+  /*
+*** ../vim-7.1.119/src/globals.h	Thu Aug 30 13:51:52 2007
+--- src/globals.h	Sun Sep 16 18:42:41 2007
+***************
+*** 301,313 ****
+  #endif
+  
+  #ifdef FEAT_EVAL
+! /* Garbage collection can only take place when we are sure there are no Lists
+   * or Dictionaries being used internally.  This is flagged with
+   * "may_garbage_collect" when we are at the toplevel.
+   * "want_garbage_collect" is set by the garbagecollect() function, which means
+!  * we do garbage collection before waiting for a char at the toplevel. */
+  EXTERN int	may_garbage_collect INIT(= FALSE);
+  EXTERN int	want_garbage_collect INIT(= FALSE);
+  
+  /* ID of script being sourced or was sourced to define the current function. */
+  EXTERN scid_T	current_SID INIT(= 0);
+--- 301,317 ----
+  #endif
+  
+  #ifdef FEAT_EVAL
+! /*
+!  * Garbage collection can only take place when we are sure there are no Lists
+   * or Dictionaries being used internally.  This is flagged with
+   * "may_garbage_collect" when we are at the toplevel.
+   * "want_garbage_collect" is set by the garbagecollect() function, which means
+!  * we do garbage collection before waiting for a char at the toplevel.
+!  * "garbage_collect_at_exit" indicates garbagecollect(1) was called.
+!  */
+  EXTERN int	may_garbage_collect INIT(= FALSE);
+  EXTERN int	want_garbage_collect INIT(= FALSE);
++ EXTERN int	garbage_collect_at_exit INIT(= FALSE);
+  
+  /* ID of script being sourced or was sourced to define the current function. */
+  EXTERN scid_T	current_SID INIT(= 0);
+*** ../vim-7.1.119/src/main.c	Thu Sep  6 17:38:06 2007
+--- src/main.c	Sun Sep 16 18:44:54 2007
+***************
+*** 1334,1339 ****
+--- 1334,1343 ----
+  #ifdef FEAT_CSCOPE
+      cs_end();
+  #endif
++ #ifdef FEAT_EVAL
++     if (garbage_collect_at_exit)
++ 	garbage_collect();
++ #endif
+  
+      mch_exit(exitval);
+  }
+*** ../vim-7.1.119/src/testdir/Makefile	Tue Aug 14 17:28:14 2007
+--- src/testdir/Makefile	Mon Sep 17 20:04:13 2007
+***************
+*** 6,12 ****
+  
+  # Uncomment this line for using valgrind.
+  # The output goes into a file "valgrind.$PID" (sorry, no test number).
+! # VALGRIND = valgrind --tool=memcheck --num-callers=15 --logfile=valgrind
+  
+  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
+  		test7.out test8.out test9.out test10.out test11.out \
+--- 6,12 ----
+  
+  # Uncomment this line for using valgrind.
+  # The output goes into a file "valgrind.$PID" (sorry, no test number).
+! # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --logfile=valgrind
+  
+  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
+  		test7.out test8.out test9.out test10.out test11.out \
+***************
+*** 39,45 ****
+  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
+  
+  clean:
+! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* viminfo
+  
+  test1.out: test1.in
+  	-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
+--- 39,45 ----
+  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
+  
+  clean:
+! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* valgrind.pid* viminfo
+  
+  test1.out: test1.in
+  	-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
+***************
+*** 65,70 ****
+--- 65,74 ----
+  		else echo $* NO OUTPUT >>test.log; \
+  		fi"
+  	-rm -rf X* test.ok viminfo
++ 
++ test49.out: test49.vim
++ 
++ test60.out: test60.vim
+  
+  nolog:
+  	-echo Test results: >test.log
+*** ../vim-7.1.119/src/testdir/test14.in	Sun Jun 13 20:24:08 2004
+--- src/testdir/test14.in	Sun Sep 16 15:57:54 2007
+***************
+*** 18,23 ****
+--- 18,24 ----
+  : let tt = "o\<C-V>65\<C-V>x42\<C-V>o103 \<C-V>33a\<C-V>xfg\<C-V>o78\<Esc>"
+  :endif
+  :exe "normal " . tt
++ :unlet tt
+  :.w >>test.out
+  :set vb
+  /^Piece
+*** ../vim-7.1.119/src/testdir/test26.in	Sun Jun 13 17:05:48 2004
+--- src/testdir/test26.in	Sun Sep 16 16:54:19 2007
+***************
+*** 37,42 ****
+--- 37,43 ----
+  :    endif
+  :  endif
+  :endwhile
++ :unlet i j
+  :'t,$w! test.out
+  :qa!
+  ENDTEST
+*** ../vim-7.1.119/src/testdir/test34.in	Sun Apr 30 20:46:14 2006
+--- src/testdir/test34.in	Sun Sep 16 21:25:47 2007
+***************
+*** 52,58 ****
+  ---*---
+  (one
+  (two
+! [(one again:$-5,$wq! test.out
+  ENDTEST
+  
+  here
+--- 52,66 ----
+  ---*---
+  (one
+  (two
+! [(one again:$-5,$w! test.out
+! :delfunc Table
+! :delfunc Compute
+! :delfunc Expr1
+! :delfunc Expr2
+! :delfunc ListItem
+! :delfunc ListReset
+! :unlet retval counter
+! :q!
+  ENDTEST
+  
+  here
+*** ../vim-7.1.119/src/testdir/test45.in	Sun Jun 13 19:57:02 2004
+--- src/testdir/test45.in	Sun Sep 16 18:27:20 2007
+***************
+*** 55,60 ****
+--- 55,61 ----
+  /kk$
+  :call append("$", foldlevel("."))
+  :/^last/+1,$w! test.out
++ :delfun Flvl
+  :qa!
+  ENDTEST
+  
+*** ../vim-7.1.119/src/testdir/test47.in	Sun Jun 13 18:40:29 2004
+--- src/testdir/test47.in	Sun Sep 16 18:32:03 2007
+***************
+*** 34,39 ****
+--- 34,40 ----
+  :call append("$", two)
+  :call append("$", three)
+  :$-2,$w! test.out
++ :unlet one two three
+  :qa!
+  ENDTEST
+  
+*** ../vim-7.1.119/src/testdir/test49.in	Sun Jun 13 18:10:00 2004
+--- src/testdir/test49.in	Sun Sep 16 23:30:35 2007
+***************
+*** 1,13 ****
+  This is a test of the script language.
+  
+  If after adding a new test, the test output doesn't appear properly in
+! test49.failed, try to add one ore more "G"s at the line before ENDTEST.
+  
+  STARTTEST
+  :so small.vim
+  :se nocp nomore viminfo+=nviminfo
+  :so test49.vim
+! GGGGGGGGGG"rp:.-,$wq! test.out
+  ENDTEST
+  
+  Results of test49.vim:
+--- 1,29 ----
+  This is a test of the script language.
+  
+  If after adding a new test, the test output doesn't appear properly in
+! test49.failed, try to add one ore more "G"s at the line ending in "test.out"
+  
+  STARTTEST
+  :so small.vim
+  :se nocp nomore viminfo+=nviminfo
+  :so test49.vim
+! GGGGGGGGGGGGGG"rp:.-,$w! test.out
+! :"
+! :" make valgrind happy
+! :redir => funclist
+! :silent func
+! :redir END
+! :for line in split(funclist, "\n")
+! :  let name = matchstr(line, 'function \zs[A-Z]\w*\ze(')
+! :  if name != ''
+! :    exe "delfunc " . name
+! :  endif
+! :endfor
+! :for v in keys(g:)
+! :  silent! exe "unlet " . v
+! :endfor
+! :unlet v
+! :qa!
+  ENDTEST
+  
+  Results of test49.vim:
+*** ../vim-7.1.119/src/testdir/test55.in	Sat May  5 20:03:56 2007
+--- src/testdir/test55.in	Mon Sep 17 19:53:48 2007
+***************
+*** 345,350 ****
+--- 345,354 ----
+  :endfun
+  :call Test(1, 2, [3, 4], {5: 6})  " This may take a while
+  :"
++ :delfunc Test
++ :unlet dict
++ :call garbagecollect(1)
++ :"
+  :/^start:/,$wq! test.out
+  ENDTEST
+  
+*** ../vim-7.1.119/src/testdir/test56.in	Tue Sep  5 13:36:02 2006
+--- src/testdir/test56.in	Sun Sep 16 17:54:20 2007
+***************
+*** 17,21 ****
+  fun s:DoNothing()
+    call append(line('$'), "nothing line")
+  endfun
+! nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<cr>
+  end:
+--- 17,21 ----
+  fun s:DoNothing()
+    call append(line('$'), "nothing line")
+  endfun
+! nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<bar>delfunc <SID>DoNothing<bar>delfunc <SID>DoLast<cr>
+  end:
+*** ../vim-7.1.119/src/testdir/test58.in	Wed Apr  5 22:38:56 2006
+--- src/testdir/test58.in	Sun Sep 16 18:17:03 2007
+***************
+*** 86,91 ****
+--- 86,92 ----
+  :$put =str
+  `m]s:let [str, a] = spellbadword()
+  :$put =str
++ :unlet str a
+  :"
+  :" Postponed prefixes
+  :call TestOne('2', '1')
+***************
+*** 99,104 ****
+--- 100,109 ----
+  :"
+  :" NOSLITSUGS
+  :call TestOne('8', '8')
++ :"
++ :" clean up for valgrind
++ :delfunc TestOne
++ :set spl= enc=latin1
+  :"
+  gg:/^test output:/,$wq! test.out
+  ENDTEST
+*** ../vim-7.1.119/src/testdir/test59.in	Wed Apr  5 22:27:11 2006
+--- src/testdir/test59.in	Sun Sep 16 18:17:23 2007
+***************
+*** 90,95 ****
+--- 90,96 ----
+  :$put =str
+  `m]s:let [str, a] = spellbadword()
+  :$put =str
++ :unlet str a
+  :"
+  :" Postponed prefixes
+  :call TestOne('2', '1')
+***************
+*** 100,105 ****
+--- 101,110 ----
+  :call TestOne('5', '5')
+  :call TestOne('6', '6')
+  :call TestOne('7', '7')
++ :"
++ :" clean up for valgrind
++ :delfunc TestOne
++ :set spl= enc=latin1
+  :"
+  gg:/^test output:/,$wq! test.out
+  ENDTEST
+*** ../vim-7.1.119/src/testdir/test60.in	Fri May  5 23:11:11 2006
+--- src/testdir/test60.in	Mon Sep 17 19:58:43 2007
+***************
+*** 569,574 ****
+--- 569,577 ----
+      redir END
+  endfunction
+  :call TestExists()
++ :delfunc TestExists
++ :delfunc RunTest
++ :delfunc TestFuncArg
+  :edit! test.out
+  :set ff=unix
+  :w
+*** ../vim-7.1.119/src/testdir/test60.vim	Fri Jan 13 00:14:55 2006
+--- src/testdir/test60.vim	Mon Sep 17 19:56:02 2007
+***************
+*** 94,97 ****
+--- 94,98 ----
+  else
+      echo "FAILED"
+  endif
++ unlet str
+  
+*** ../vim-7.1.119/src/testdir/test62.in	Sun Apr 30 20:28:14 2006
+--- src/testdir/test62.in	Sun Sep 16 17:24:04 2007
+***************
+*** 7,12 ****
+--- 7,13 ----
+  :let nr = tabpagenr()
+  :q
+  :call append(line('$'), 'tab page ' . nr)
++ :unlet nr
+  :"
+  :" Open three tab pages and use ":tabdo"
+  :0tabnew
+***************
+*** 23,28 ****
+--- 24,30 ----
+  :q!
+  :call append(line('$'), line1)
+  :call append(line('$'), line2)
++ :unlet line1 line2
+  :"
+  :"
+  :/^Results/,$w! test.out
+*** ../vim-7.1.119/src/testdir/test63.in	Thu Jul 26 22:55:11 2007
+--- src/testdir/test63.in	Sun Sep 16 17:11:07 2007
+***************
+*** 60,66 ****
+  :else
+  :  let @r .= "FAILED\n"
+  :endif
+! :" --- Check that "matchdelete()" returns 0 if succesfull and otherwise -1.
+  :let @r .= "*** Test 6: "
+  :let m = matchadd("MyGroup1", "TODO")
+  :let r1 = matchdelete(m)
+--- 60,66 ----
+  :else
+  :  let @r .= "FAILED\n"
+  :endif
+! :" --- Check that "matchdelete()" returns 0 if successful and otherwise -1.
+  :let @r .= "*** Test 6: "
+  :let m = matchadd("MyGroup1", "TODO")
+  :let r1 = matchdelete(m)
+***************
+*** 117,123 ****
+  :" --- Check that "setmatches()" will not add two matches with the same ID. The
+  :" --- expected behaviour (for now) is to add the first match but not the
+  :" --- second and to return 0 (even though it is a matter of debate whether
+! :" --- this can be considered succesfull behaviour).
+  :let @r .= "*** Test 9: "
+  :let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])
+  :if getmatches() == [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}] && r1 == 0
+--- 117,123 ----
+  :" --- Check that "setmatches()" will not add two matches with the same ID. The
+  :" --- expected behaviour (for now) is to add the first match but not the
+  :" --- second and to return 0 (even though it is a matter of debate whether
+! :" --- this can be considered successful behaviour).
+  :let @r .= "*** Test 9: "
+  :let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])
+  :if getmatches() == [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}] && r1 == 0
+***************
+*** 127,133 ****
+  :endif
+  :call clearmatches()
+  :unlet r1
+! :" --- Check that "setmatches()" returns 0 if succesfull and otherwise -1.
+  :" --- (A range of valid and invalid input values are tried out to generate the
+  :" --- return values.)
+  :let @r .= "*** Test 10: "
+--- 127,133 ----
+  :endif
+  :call clearmatches()
+  :unlet r1
+! :" --- Check that "setmatches()" returns 0 if successful and otherwise -1.
+  :" --- (A range of valid and invalid input values are tried out to generate the
+  :" --- return values.)
+  :let @r .= "*** Test 10: "
+*** ../vim-7.1.119/src/testdir/test64.in	Tue Aug 14 17:28:14 2007
+--- src/testdir/test64.in	Sun Sep 16 17:43:03 2007
+***************
+*** 44,51 ****
+--- 44,53 ----
+  :        $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
+  :      endif
+  :    endfor
++ :    unlet i
+  :  endif
+  :endfor
++ :unlet t tl e l
+  :/^Results/,$wq! test.out
+  ENDTEST
+  
+*** ../vim-7.1.119/src/version.c	Tue Sep 25 14:50:19 2007
+--- src/version.c	Tue Sep 25 17:36:22 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     120,
+  /**/
+
+-- 
+BEDEVERE: How do you know so much about swallows?
+ARTHUR:   Well you have to know these things when you're a king, you know.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Added: trunk/packages/vim/upstream/patches/7.1.121
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.121?rev=1041&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.121 (added)
+++ trunk/packages/vim/upstream/patches/7.1.121 Wed Sep 26 13:50:17 2007
@@ -1,0 +1,81 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.121
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.121
+Problem:    Using ":cd %:h" when editing a file in the current directory
+	    results in an error message for using an empty string.
+Solution:   When "%:h" results in an empty string use ".".
+Files:	    src/eval.c
+
+
+*** ../vim-7.1.120/src/eval.c	Tue Sep 25 17:54:41 2007
+--- src/eval.c	Sun Sep 16 19:24:49 2007
+***************
+*** 21308,21321 ****
+  	*usedlen += 2;
+  	s = get_past_head(*fnamep);
+  	while (tail > s && after_pathsep(s, tail))
+! 	    --tail;
+  	*fnamelen = (int)(tail - *fnamep);
+  #ifdef VMS
+  	if (*fnamelen > 0)
+  	    *fnamelen += 1; /* the path separator is part of the path */
+  #endif
+! 	while (tail > s && !after_pathsep(s, tail))
+! 	    mb_ptr_back(*fnamep, tail);
+      }
+  
+      /* ":8" - shortname  */
+--- 21308,21334 ----
+  	*usedlen += 2;
+  	s = get_past_head(*fnamep);
+  	while (tail > s && after_pathsep(s, tail))
+! 	    mb_ptr_back(*fnamep, tail);
+  	*fnamelen = (int)(tail - *fnamep);
+  #ifdef VMS
+  	if (*fnamelen > 0)
+  	    *fnamelen += 1; /* the path separator is part of the path */
+  #endif
+! 	if (*fnamelen == 0)
+! 	{
+! 	    /* Result is empty.  Turn it into "." to make ":cd %:h" work. */
+! 	    p = vim_strsave((char_u *)".");
+! 	    if (p == NULL)
+! 		return -1;
+! 	    vim_free(*bufp);
+! 	    *bufp = *fnamep = tail = p;
+! 	    *fnamelen = 1;
+! 	}
+! 	else
+! 	{
+! 	    while (tail > s && !after_pathsep(s, tail))
+! 		mb_ptr_back(*fnamep, tail);
+! 	}
+      }
+  
+      /* ":8" - shortname  */
+*** ../vim-7.1.120/src/version.c	Tue Sep 25 17:54:41 2007
+--- src/version.c	Tue Sep 25 20:38:08 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     121,
+  /**/
+
+-- 
+It is illegal for anyone to try and stop a child from playfully jumping over
+puddles of water.
+		[real standing law in California, United States of America]
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Added: trunk/packages/vim/upstream/patches/7.1.122
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.122?rev=1041&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.122 (added)
+++ trunk/packages/vim/upstream/patches/7.1.122 Wed Sep 26 13:50:17 2007
@@ -1,0 +1,98 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.122
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.122
+Problem:    Mac: building Vim.app fails.  Using wrong architecture.
+Solution:   Use line continuation for the gui_bundle dependency.  Detect the
+	    system architecture with "uname -a".
+Files:	    src/main.aap
+
+
+*** ../vim-7.1.121/src/main.aap	Thu May 10 18:48:19 2007
+--- src/main.aap	Tue Sep 25 21:26:03 2007
+***************
+*** 56,64 ****
+      config {virtual} auto/config.h auto/config.aap :
+                           auto/configure.aap configure.aap
+                           config.arg config.h.in config.aap.in
+          :sys CONFIG_STATUS=auto/config.status
+                  ./configure.aap `file2string("config.arg")`
+!                     --with-mac-arch=ppc
+                      --cache-file=auto/config.cache
+  
+      # Configure arguments: create an empty "config.arg" file when its missing
+--- 56,71 ----
+      config {virtual} auto/config.h auto/config.aap :
+                           auto/configure.aap configure.aap
+                           config.arg config.h.in config.aap.in
++         # Use "uname -a" to detect the architecture of the system.
++         @ok, uname = redir_system('uname -a', 0)
++         @if string.find(uname, "i386") >= 0:
++         @   arch = "i386"
++         @else:
++         @   arch = "ppc"
++         :print Building for $arch system
+          :sys CONFIG_STATUS=auto/config.status
+                  ./configure.aap `file2string("config.arg")`
+!                     --with-mac-arch=$arch
+                      --cache-file=auto/config.cache
+  
+      # Configure arguments: create an empty "config.arg" file when its missing
+***************
+*** 1167,1173 ****
+          :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
+  # TODO: Create the vimtutor application.
+  
+! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info
+                          bundle-resource bundle-language
+  
+  bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
+--- 1174,1180 ----
+          :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
+  # TODO: Create the vimtutor application.
+  
+! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info \
+                          bundle-resource bundle-language
+  
+  bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
+***************
+*** 1187,1193 ****
+          :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
+  
+  bundle-resource {virtual}: bundle-dir bundle-rsrc
+!     :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
+  
+  ### Classic resources
+  # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
+--- 1194,1200 ----
+          :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
+  
+  bundle-resource {virtual}: bundle-dir bundle-rsrc
+!         :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
+  
+  ### Classic resources
+  # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
+*** ../vim-7.1.121/src/version.c	Tue Sep 25 20:39:14 2007
+--- src/version.c	Tue Sep 25 22:12:16 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     122,
+  /**/
+
+-- 
+Men may not be seen publicly in any kind of strapless gown.
+		[real standing law in Florida, United States of America]
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///




More information about the pkg-vim-maintainers mailing list