r503 - in trunk/vim: debian upstream/patches

[James Vega]

Author: jamessan
Date: 2006-02-25 14:07:58 +0000 (Sat, 25 Feb 2006)
New Revision: 503

Added:
   trunk/vim/upstream/patches/6.4.008
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
Upstream patch 6.4.008


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2006-02-23 16:21:51 UTC (rev 502)
+++ trunk/vim/debian/README	2006-02-25 14:07:58 UTC (rev 503)
@@ -32,3 +32,4 @@
   1577  6.4.005  truncating message may write before buffer
   2320  6.4.006  ":argedit", "argdel" and ":argadd" used count argument
   1717  6.4.007  Unix: crash when expanding backticks
+  2199  6.4.008  hang for 'hlsearch' highlighting in multi-byte character

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2006-02-23 16:21:51 UTC (rev 502)
+++ trunk/vim/debian/changelog	2006-02-25 14:07:58 UTC (rev 503)
@@ -1,5 +1,8 @@
-vim (1:6.4-007+2) UNRELEASED; urgency=low
+vim (1:6.4-008+1) UNRELEASED; urgency=low
 
+  [ Debian Vim Maintainers ]
+  * New upstream patch (008), see README.gz for details.
+
   [ Pierre Habouzit ]
   * Support python `as' keyword. (closes: #352885)
 
@@ -12,7 +15,7 @@
   * Move vimtutor.1 to the same package (vim-runtime) as vimtutor.
     Fixes a lintian warning.
 
- -- James Vega <jamessan at debian.org>  Thu, 23 Feb 2006 09:21:04 -0500
+ -- James Vega <jamessan at debian.org>  Sat, 25 Feb 2006 08:58:43 -0500
 
 vim (1:6.4-007+1) unstable; urgency=low
 

Added: trunk/vim/upstream/patches/6.4.008
===================================================================
--- trunk/vim/upstream/patches/6.4.008	2006-02-23 16:21:51 UTC (rev 502)
+++ trunk/vim/upstream/patches/6.4.008	2006-02-25 14:07:58 UTC (rev 503)
@@ -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         ///