[SCM] Vim packaging branch, upstream, updated. upstream/7.2c.000-4-g8d10f9c

James Vega jamessan at debian.org
Sun Aug 10 01:35:29 UTC 2008


The following commit has been merged in the upstream branch:
commit a0cd0f6f33a017c889198880ae191cc3dc2b0e62
Author: Bram Moolenaar <Bram at moolenaar.net>
Date:   Sat Aug 9 21:19:33 2008 -0400

    [7.2c.003]
    Patch 7.2c.003
    Problem:    Searching for "foo\%[bar]\+" gives a "Corrupted regexp program"
                error. (Joachim Hofmann)
    Solution:   Mark the \%[] item as not being simple.

diff --git a/src/regexp.c b/src/regexp.c
index bf113da..ac60c69 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1899,7 +1899,7 @@ regatom(flagp)
 					  br = regnext(br);
 				  }
 			      }
-			      *flagp &= ~HASWIDTH;
+			      *flagp &= ~(HASWIDTH | SIMPLE);
 			      break;
 			  }
 
diff --git a/src/version.c b/src/version.c
index 6730cc0..61adb88 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3,
+/**/
     2,
 /**/
     1,

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list