SOURCES: 6.4.007 (NEW), 6.4.008 (NEW) - new

arekm arekm at pld-linux.org
Tue Mar 7 18:39:43 CET 2006


Author: arekm                        Date: Tue Mar  7 17:39:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   6.4.007 (NONE -> 1.1)  (NEW), 6.4.008 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/6.4.007
diff -u /dev/null SOURCES/6.4.007:1.1
--- /dev/null	Tue Mar  7 18:39:43 2006
+++ SOURCES/6.4.007	Tue Mar  7 18:39:38 2006
@@ -0,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4.007
+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 6.4.007
+Problem:    Crash when expanding a file name argument in backticks. (Adri
+	    Verhoef)
+Solution:   Check for the NUL after the expansion result.
+Files:	    src/os_unix.c
+
+
+*** ../vim-6.4.006/src/os_unix.c	Sat Oct  8 16:39:10 2005
+--- src/os_unix.c	Thu Feb  2 12:48:28 2006
+***************
+*** 5051,5057 ****
+  	/* Space or NL separates */
+  	if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
+  	{
+! 	    while (!(shell_style == STYLE_ECHO && *p == ' ') && *p != '\n')
+  		++p;
+  	    if (p == buffer + len)		/* last entry */
+  		*p = NUL;
+--- 5051,5058 ----
+  	/* Space or NL separates */
+  	if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
+  	{
+! 	    while (!(shell_style == STYLE_ECHO && *p == ' ')
+! 						   && *p != '\n' && *p != NUL)
+  		++p;
+  	    if (p == buffer + len)		/* last entry */
+  		*p = NUL;
+*** ../vim-6.4.006/src/version.c	Thu Dec 22 22:39:11 2005
+--- src/version.c	Wed Feb  8 11:10:30 2006
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     7,
+  /**/
+
+-- 
+"My particular problem is with registry entries, which seem to just accumulate
+like plastic coffee cups..."           -- Paul Moore
+
+ /// 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://www.ICCF.nl         ///

================================================================
Index: SOURCES/6.4.008
diff -u /dev/null SOURCES/6.4.008:1.1
--- /dev/null	Tue Mar  7 18:39:43 2006
+++ SOURCES/6.4.008	Tue Mar  7 18:39:38 2006
@@ -0,0 +1,75 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4.008
+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 6.4.008
+Problem:    Hang in search for 'hlsearch' highlighting. (Yukihiro Nakadaira)
+Solution:   Skip over (multi-byte) character instead of single byte.
+Files:	    src/screen.c
+
+
+*** ../vim-6.4.007/src/screen.c	Wed Jan 19 11:03:00 2005
+--- src/screen.c	Sat Feb 25 14:34:41 2006
+***************
+*** 5803,5814 ****
+  		|| (shl->rm.endpos[0].lnum == 0
+  		    && shl->rm.endpos[0].col == shl->rm.startpos[0].col))
+  	{
+! 	    matchcol = shl->rm.startpos[0].col + 1;
+! 	    if (ml_get_buf(shl->buf, lnum, FALSE)[matchcol - 1] == NUL)
+  	    {
+  		shl->lnum = 0;
+  		break;
+  	    }
+  	}
+  	else
+  	    matchcol = shl->rm.endpos[0].col;
+--- 5803,5824 ----
+  		|| (shl->rm.endpos[0].lnum == 0
+  		    && shl->rm.endpos[0].col == shl->rm.startpos[0].col))
+  	{
+! 	    char_u	*ml;
+! 
+! 	    matchcol = shl->rm.startpos[0].col;
+! 	    ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol;
+! 	    if (*ml == NUL)
+  	    {
++ 		++matchcol;
+  		shl->lnum = 0;
+  		break;
+  	    }
++ #ifdef FEAT_MBYTE
++ 	    if (has_mbyte)
++ 		matchcol += mb_ptr2len_check(ml);
++ 	    else
++ #endif
++ 		++matchcol;
+  	}
+  	else
+  	    matchcol = shl->rm.endpos[0].col;
+*** ../vim-6.4.007/src/version.c	Wed Feb  8 11:11:51 2006
+--- src/version.c	Sat Feb 25 14:37:36 2006
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     8,
+  /**/
+
+-- 
+Team-building exercises come in many forms but they all trace their roots back
+to the prison system.  In your typical team-building exercise the employees
+are subjected to a variety of unpleasant situations until they become either a
+cohesive team or a ring of car jackers.
+				(Scott Adams - The Dilbert principle)
+
+ /// 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://www.ICCF.nl         ///
================================================================


More information about the pld-cvs-commit mailing list