packages: vim/7.2.270 (NEW), vim/7.2.271 (NEW), vim/7.2.272 (NEW), vim/7.2....

adamg adamg at pld-linux.org
Sat Nov 7 15:54:45 CET 2009


Author: adamg                        Date: Sat Nov  7 14:54:45 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new

---- Files affected:
packages/vim:
   7.2.270 (NONE -> 1.1)  (NEW), 7.2.271 (NONE -> 1.1)  (NEW), 7.2.272 (NONE -> 1.1)  (NEW), 7.2.273 (NONE -> 1.1)  (NEW), 7.2.274 (NONE -> 1.1)  (NEW), 7.2.275 (NONE -> 1.1)  (NEW), 7.2.276 (NONE -> 1.1)  (NEW), 7.2.277 (NONE -> 1.1)  (NEW), 7.2.278 (NONE -> 1.1)  (NEW), 7.2.279 (NONE -> 1.1)  (NEW), 7.2.280 (NONE -> 1.1)  (NEW), 7.2.281 (NONE -> 1.1)  (NEW), 7.2.282 (NONE -> 1.1)  (NEW), 7.2.283 (NONE -> 1.1)  (NEW), 7.2.284 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vim/7.2.270
diff -u /dev/null packages/vim/7.2.270:1.1
--- /dev/null	Sat Nov  7 15:54:45 2009
+++ packages/vim/7.2.270	Sat Nov  7 15:54:39 2009
@@ -0,0 +1,72 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.270
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.270
+Problem:    Using ":@c" when the c register contains a CR causes the rest to
+	    be executed later. (Dexter Douglas)
+Solution:   Don't check for typeahead to start with ':', keep executing
+	    commands until all added typeahead has been used.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.269/src/ex_docmd.c	2009-09-30 13:23:57.000000000 +0200
+--- src/ex_docmd.c	2009-10-28 12:06:54.000000000 +0100
+***************
+*** 8358,8363 ****
+--- 8358,8364 ----
+      exarg_T	*eap;
+  {
+      int		c;
++     int		prev_len = typebuf.tb_len;
+  
+      curwin->w_cursor.lnum = eap->line2;
+  
+***************
+*** 8383,8393 ****
+  
+  	/*
+  	 * Execute from the typeahead buffer.
+! 	 * Originally this didn't check for the typeahead buffer to be empty,
+! 	 * thus could read more Ex commands from stdin.  It's not clear why,
+! 	 * it is certainly unexpected.
+  	 */
+! 	while ((!stuff_empty() || typebuf.tb_len > 0) && vpeekc() == ':')
+  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
+  
+  	exec_from_reg = save_efr;
+--- 8384,8393 ----
+  
+  	/*
+  	 * Execute from the typeahead buffer.
+! 	 * Continue until the stuff buffer is empty and all added characters
+! 	 * have been consumed.
+  	 */
+! 	while (!stuff_empty() || typebuf.tb_len > prev_len)
+  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
+  
+  	exec_from_reg = save_efr;
+*** ../vim-7.2.269/src/version.c	2009-11-03 12:10:39.000000000 +0100
+--- src/version.c	2009-11-03 12:32:47.000000000 +0100
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     270,
+  /**/
+
+-- 
+To the optimist, the glass is half full.
+To the pessimist, the glass is half empty.
+To the engineer, the glass is twice as big as it needs to be.
+
+ /// 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    ///

================================================================
Index: packages/vim/7.2.271
diff -u /dev/null packages/vim/7.2.271:1.1
--- /dev/null	Sat Nov  7 15:54:45 2009
+++ packages/vim/7.2.271	Sat Nov  7 15:54:39 2009
@@ -0,0 +1,92 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.271
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.271
+Problem:    Using freed memory in Motif GUI version when making a choice.
+Solution:   Free memory only after using it. (Dominique Pelle)
+Files:	    src/gui_xmdlg.c
+
+
+*** ../vim-7.2.270/src/gui_xmdlg.c	2009-05-21 23:25:38.000000000 +0200
+--- src/gui_xmdlg.c	2009-10-28 21:56:15.000000000 +0100
+***************
+*** 10,16 ****
+  /*
+   * (C) 2001,2005 by Marcin Dalecki <martin at dalecki.de>
+   *
+!  * Implementation of dialogue functions for the Motif GUI variant.
+   *
+   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
+   * when using a dynamic scrollbar policy.
+--- 10,16 ----
+  /*
+   * (C) 2001,2005 by Marcin Dalecki <martin at dalecki.de>
+   *
+!  * Implementation of dialog functions for the Motif GUI variant.
+   *
+   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
+   * when using a dynamic scrollbar policy.
+***************
+*** 633,648 ****
+  	data->sel[which] = XtNewString(sel);
+      else
+      {
+- 	XtFree(data->sel[which]);
+  	if (!strcmp(data->sel[which], sel))
+  	{
+  	    /* unselecting current selection */
+  	    data->sel[which] = NULL;
+  	    if (w)
+  		XmListDeselectItem(w, call_data->item);
+  	}
+  	else
+  	    data->sel[which] = XtNewString(sel);
+      }
+      XtFree(sel);
+  
+--- 633,651 ----
+  	data->sel[which] = XtNewString(sel);
+      else
+      {
+  	if (!strcmp(data->sel[which], sel))
+  	{
+  	    /* unselecting current selection */
++ 	    XtFree(data->sel[which]);
+  	    data->sel[which] = NULL;
+  	    if (w)
+  		XmListDeselectItem(w, call_data->item);
+  	}
+  	else
++ 	{
++ 	    XtFree(data->sel[which]);
+  	    data->sel[which] = XtNewString(sel);
++ 	}
+      }
+      XtFree(sel);
+  
+*** ../vim-7.2.270/src/version.c	2009-11-03 12:38:50.000000000 +0100
+--- src/version.c	2009-11-03 12:48:26.000000000 +0100
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     271,
+  /**/
+
+-- 
+ROBIN:  (warily) And if you get a question wrong?
+ARTHUR: You are cast into the Gorge of Eternal Peril.
+ROBIN:  Oh ... wacho!
+                 "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    ///

================================================================
Index: packages/vim/7.2.272
diff -u /dev/null packages/vim/7.2.272:1.1
--- /dev/null	Sat Nov  7 15:54:45 2009
+++ packages/vim/7.2.272	Sat Nov  7 15:54:39 2009
@@ -0,0 +1,82 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.272
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.272
+Problem:    "_.svz" is not recognized as a swap file. (David M. Besonen)
+Solution:   Accept .s[uvw][a-z] as a swap file name extension.
+Files:	    src/memline.c
+
+
+*** ../vim-7.2.271/src/memline.c	2009-04-22 15:56:27.000000000 +0200
+--- src/memline.c	2009-10-29 20:55:08.000000000 +0100
+***************
+*** 864,884 ****
+      recoverymode = TRUE;
+      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
+      attr = hl_attr(HLF_E);
+! /*
+!  * If the file name ends in ".sw?" we use it directly.
+!  * Otherwise a search is done to find the swap file(s).
+!  */
+      fname = curbuf->b_fname;
+      if (fname == NULL)		    /* When there is no file name */
+  	fname = (char_u *)"";
+      len = (int)STRLEN(fname);
+      if (len >= 4 &&
+  #if defined(VMS) || defined(RISCOS)
+! 	    STRNICMP(fname + len - 4, "_sw" , 3)
+  #else
+! 	    STRNICMP(fname + len - 4, ".sw" , 3)
+  #endif
+! 		== 0)
+      {
+  	directly = TRUE;
+  	fname = vim_strsave(fname); /* make a copy for mf_open() */
+--- 864,887 ----
+      recoverymode = TRUE;
+      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
+      attr = hl_attr(HLF_E);
+! 
+!     /*
+!      * If the file name ends in ".s[uvw][a-z]" we assume this is the swap file.
+!      * Otherwise a search is done to find the swap file(s).
+!      */
+      fname = curbuf->b_fname;
+      if (fname == NULL)		    /* When there is no file name */
+  	fname = (char_u *)"";
+      len = (int)STRLEN(fname);
+      if (len >= 4 &&
+  #if defined(VMS) || defined(RISCOS)
+! 	    STRNICMP(fname + len - 4, "_s" , 2)
+  #else
+! 	    STRNICMP(fname + len - 4, ".s" , 2)
+  #endif
+! 		== 0
+! 		&& vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
+! 		&& ASCII_ISALPHA(fname[len - 1]))
+      {
+  	directly = TRUE;
+  	fname = vim_strsave(fname); /* make a copy for mf_open() */
+*** ../vim-7.2.271/src/version.c	2009-11-03 12:53:44.000000000 +0100
+--- src/version.c	2009-11-03 13:02:51.000000000 +0100
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     272,
+  /**/
+
+-- 
+Sorry, no fortune today.
+
+ /// 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    ///

================================================================
Index: packages/vim/7.2.273
diff -u /dev/null packages/vim/7.2.273:1.1
--- /dev/null	Sat Nov  7 15:54:45 2009
+++ packages/vim/7.2.273	Sat Nov  7 15:54:39 2009
@@ -0,0 +1,130 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.273
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.273
+Problem:    Crash with redir to unknown array. (Christian Brabandt)
+Solution:   Don't assign the redir result when there was an error.
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.272/src/eval.c	2009-09-30 15:15:33.000000000 +0200
+--- src/eval.c	2009-11-03 12:05:07.000000000 +0100
+***************
+*** 988,1000 ****
+      int		err;
+      typval_T	tv;
+  
+!     /* Make sure a valid variable name is specified */
+      if (!eval_isnamec1(*name))
+      {
+  	EMSG(_(e_invarg));
+  	return FAIL;
+      }
+  
+      redir_varname = vim_strsave(name);
+      if (redir_varname == NULL)
+  	return FAIL;
+--- 988,1001 ----
+      int		err;
+      typval_T	tv;
+  
+!     /* Catch a bad name early. */
+      if (!eval_isnamec1(*name))
+      {
+  	EMSG(_(e_invarg));
+  	return FAIL;
+      }
+  
++     /* Make a copy of the name, it is used in redir_lval until redir ends. */
+      redir_varname = vim_strsave(name);
+      if (redir_varname == NULL)
+  	return FAIL;
+***************
+*** 1019,1024 ****
+--- 1020,1026 ----
+  	    EMSG(_(e_trailing));
+  	else
+  	    EMSG(_(e_invarg));
++ 	redir_endp = NULL;  /* don't store a value, only cleanup */
+  	var_redir_stop();
+  	return FAIL;
+      }
+***************
+*** 1037,1042 ****
+--- 1039,1045 ----
+      did_emsg |= save_emsg;
+      if (err)
+      {
++ 	redir_endp = NULL;  /* don't store a value, only cleanup */
+  	var_redir_stop();
+  	return FAIL;
+      }
+***************
+*** 1085,1090 ****
+--- 1088,1094 ----
+  
+  /*
+   * Stop redirecting command output to a variable.
++  * Frees the allocated memory.
+   */
+      void
+  var_redir_stop()
+***************
+*** 1093,1106 ****
+  
+      if (redir_lval != NULL)
+      {
+! 	/* Append the trailing NUL. */
+! 	ga_append(&redir_ga, NUL);
+  
+! 	/* Assign the text to the variable. */
+! 	tv.v_type = VAR_STRING;
+! 	tv.vval.v_string = redir_ga.ga_data;
+! 	set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
+! 	vim_free(tv.vval.v_string);
+  
+  	clear_lval(redir_lval);
+  	vim_free(redir_lval);
+--- 1097,1114 ----
+  
+      if (redir_lval != NULL)
+      {
+! 	/* If there was no error: assign the text to the variable. */
+! 	if (redir_endp != NULL)
+! 	{
+! 	    ga_append(&redir_ga, NUL);  /* Append the trailing NUL. */
+! 	    tv.v_type = VAR_STRING;
+! 	    tv.vval.v_string = redir_ga.ga_data;
+! 	    set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
+! 	}
+  
+! 	/* free the collected output */
+! 	vim_free(redir_ga.ga_data);
+! 	redir_ga.ga_data = NULL;
+  
+  	clear_lval(redir_lval);
+  	vim_free(redir_lval);
+*** ../vim-7.2.272/src/version.c	2009-11-03 13:06:03.000000000 +0100
+--- src/version.c	2009-11-03 14:24:06.000000000 +0100
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     273,
+  /**/
+
+-- 
+Permission is granted to read this message out aloud on Kings Cross Road,
+London, under the condition that the orator is properly dressed.
+
+ /// 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    ///

================================================================
Index: packages/vim/7.2.274
diff -u /dev/null packages/vim/7.2.274:1.1
--- /dev/null	Sat Nov  7 15:54:45 2009
+++ packages/vim/7.2.274	Sat Nov  7 15:54:39 2009
@@ -0,0 +1,130 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.274
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.274
+Problem:    Syntax folding doesn't work properly when adding a comment.
+Solution:   Fix it and add a test. (Lech Lorens)
+Files:	    src/fold.c, src/testdir/test45.in, src/testdir/test45.ok
+
+
+*** ../vim-7.2.273/src/fold.c	2009-09-18 15:16:37.000000000 +0200
+--- src/fold.c	2009-11-03 12:36:37.000000000 +0100
+***************
+*** 2256,2261 ****
+--- 2256,2295 ----
+  	}
+      }
+  
++     /*
++      * If folding is defined by the syntax, it is possible that a change in
++      * one line will cause all sub-folds of the current fold to change (e.g.,
++      * closing a C-style comment can cause folds in the subsequent lines to
++      * appear). To take that into account we should adjust the value of "bot"
++      * to point to the end of the current fold:
++      */
++     if (foldlevelSyntax == getlevel)
++     {
++ 	garray_T *gap = &wp->w_folds;
++ 	fold_T	 *fp = NULL;
++ 	int	  current_fdl = 0;
++ 	linenr_T  fold_start_lnum = 0;
++ 	linenr_T  lnum_rel = fline.lnum;
++ 
++ 	while (current_fdl < fline.lvl)
++ 	{
++ 	    if (!foldFind(gap, lnum_rel, &fp))
++ 		break;
++ 	    ++current_fdl;
++ 
++ 	    fold_start_lnum += fp->fd_top;
++ 	    gap = &fp->fd_nested;
++ 	    lnum_rel -= fp->fd_top;
++ 	}
++ 	if (fp != NULL && current_fdl == fline.lvl)
++ 	{
++ 	    linenr_T fold_end_lnum = fold_start_lnum + fp->fd_len;
++ 
++ 	    if (fold_end_lnum > bot)
++ 		bot = fold_end_lnum;
++ 	}
++     }
++ 
+      start = fline.lnum;
+      end = bot;
+      /* Do at least one line. */
+*** ../vim-7.2.273/src/testdir/test45.in	2007-09-25 17:58:43.000000000 +0200
+--- src/testdir/test45.in	2009-11-03 12:22:38.000000000 +0100
+***************
+*** 28,36 ****
+  k:call append("$", foldlevel("."))
+  :" test syntax folding
+  :set fdm=syntax fdl=0
+! :syn region Hup start="dd" end="hh" fold
+  Gzk:call append("$", "folding " . getline("."))
+  k:call append("$", getline("."))
+  :" test expression folding
+  :fun Flvl()
+    let l = getline(v:lnum)
+--- 28,41 ----
+  k:call append("$", foldlevel("."))
+  :" test syntax folding
+  :set fdm=syntax fdl=0
+! :syn region Hup start="dd" end="ii" fold contains=Fd1,Fd2,Fd3
+! :syn region Fd1 start="ee" end="ff" fold contained
+! :syn region Fd2 start="gg" end="hh" fold contained
+! :syn region Fd3 start="commentstart" end="commentend" fold contained
+  Gzk:call append("$", "folding " . getline("."))
+  k:call append("$", getline("."))
++ jAcommentstart  Acommentend:set fdl=1
++ 3j:call append("$", getline("."))
+  :" test expression folding
+  :fun Flvl()
+    let l = getline(v:lnum)
+*** ../vim-7.2.273/src/testdir/test45.ok	2004-06-13 17:47:37.000000000 +0200
+--- src/testdir/test45.ok	2009-11-03 12:22:50.000000000 +0100
+***************
+*** 8,15 ****
+  0
+  indent 2
+  1
+! folding 8 hh
+      3 cc
+  expr 2
+  1
+  2
+--- 8,16 ----
+  0
+  indent 2
+  1
+! folding 9 ii
+      3 cc
++ 7 gg
+  expr 2
+  1
+  2
+*** ../vim-7.2.273/src/version.c	2009-11-03 14:26:29.000000000 +0100
+--- src/version.c	2009-11-03 14:44:21.000000000 +0100
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     274,
+  /**/
+
+-- 
+BRIDGEKEEPER: What is your favorite colour?
+LAUNCELOT:    Blue.
+BRIDGEKEEPER: Right.  Off you go.
+                 "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    ///

================================================================
Index: packages/vim/7.2.275
diff -u /dev/null packages/vim/7.2.275:1.1
--- /dev/null	Sat Nov  7 15:54:45 2009
+++ packages/vim/7.2.275	Sat Nov  7 15:54:39 2009
@@ -0,0 +1,95 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.275
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.275
+Problem:    Warning for unused argument and comparing signed and unsigned.
+Solution:   Add type cast.
+Files:	    src/memline.c
+
+
+*** ../vim-7.2.274/src/memline.c	2009-11-03 13:06:03.000000000 +0100
+--- src/memline.c	2009-10-29 20:55:08.000000000 +0100
+***************
+*** 1285,1291 ****
+  		    for (i = 0; i < dp->db_line_count; ++i)
+  		    {
+  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
+! 			if (txt_start <= HEADER_SIZE
+  					  || txt_start >= (int)dp->db_txt_end)
+  			{
+  			    p = (char_u *)"???";
+--- 1285,1291 ----
+  		    for (i = 0; i < dp->db_line_count; ++i)
+  		    {
+  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
+! 			if (txt_start <= (int)HEADER_SIZE
+  					  || txt_start >= (int)dp->db_txt_end)
+  			{
+  			    p = (char_u *)"???";
+***************
+*** 1296,1302 ****
+  			ml_append(lnum++, p, (colnr_T)0, TRUE);
+  		    }
+  		    if (has_error)
+! 			ml_append(lnum++, (char_u *)_("???END"), (colnr_T)0, TRUE);
+  		}
+  	    }
+  	}
+--- 1296,1303 ----
+  			ml_append(lnum++, p, (colnr_T)0, TRUE);
+  		    }
+  		    if (has_error)
+! 			ml_append(lnum++, (char_u *)_("???END"),
+! 							    (colnr_T)0, TRUE);
+  		}
+  	    }
+  	}
+***************
+*** 3576,3586 ****
+   * Make swap file name out of the file name and a directory name.
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list