+++ /dev/null
-diff -r 85c04c7963d1 -r 43de4ebbe7ad src/regexp_nfa.c
---- src/regexp_nfa.c Tue Jun 04 14:23:05 2013 +0200
-+++ src/regexp_nfa.c Tue Jun 04 17:47:05 2013 +0200
-@@ -380,38 +380,18 @@
- char_u *end;
- int extra_newl;
- {
-- int i;
-- /* Each of these variables takes up a char in "config[]",
-- * in the order they are here. */
-- int not = FALSE, af = FALSE, AF = FALSE, az = FALSE, AZ = FALSE,
-- o7 = FALSE, o9 = FALSE, underscore = FALSE, newl = FALSE;
-+# define CLASS_not 0x80
-+# define CLASS_af 0x40
-+# define CLASS_AF 0x20
-+# define CLASS_az 0x10
-+# define CLASS_AZ 0x08
-+# define CLASS_o7 0x04
-+# define CLASS_o9 0x02
-+# define CLASS_underscore 0x01
-+
-+ int newl = FALSE;
- char_u *p;
--#define NCONFIGS 16
-- int classid[NCONFIGS] = {
-- NFA_DIGIT, NFA_NDIGIT, NFA_HEX, NFA_NHEX,
-- NFA_OCTAL, NFA_NOCTAL, NFA_WORD, NFA_NWORD,
-- NFA_HEAD, NFA_NHEAD, NFA_ALPHA, NFA_NALPHA,
-- NFA_LOWER, NFA_NLOWER, NFA_UPPER, NFA_NUPPER
-- };
-- char_u myconfig[10];
-- char_u config[NCONFIGS][9] = {
-- "000000100", /* digit */
-- "100000100", /* non digit */
-- "011000100", /* hex-digit */
-- "111000100", /* non hex-digit */
-- "000001000", /* octal-digit */
-- "100001000", /* [^0-7] */
-- "000110110", /* [0-9A-Za-z_] */
-- "100110110", /* [^0-9A-Za-z_] */
-- "000110010", /* head of word */
-- "100110010", /* not head of word */
-- "000110000", /* alphabetic char a-z */
-- "100110000", /* non alphabetic char */
-- "000100000", /* lowercase letter */
-- "100100000", /* non lowercase */
-- "000010000", /* uppercase */
-- "100010000" /* non uppercase */
-- };
-+ int config = 0;
-
- if (extra_newl == TRUE)
- newl = TRUE;
-@@ -421,7 +401,7 @@
- p = start;
- if (*p == '^')
- {
-- not = TRUE;
-+ config |= CLASS_not;
- p++;
- }
-
-@@ -434,37 +414,37 @@
- case '0':
- if (*(p + 2) == '9')
- {
-- o9 = TRUE;
-+ config |= CLASS_o9;
- break;
- }
- else
- if (*(p + 2) == '7')
- {
-- o7 = TRUE;
-+ config |= CLASS_o7;
- break;
- }
- case 'a':
- if (*(p + 2) == 'z')
- {
-- az = TRUE;
-+ config |= CLASS_az;
- break;
- }
- else
- if (*(p + 2) == 'f')
- {
-- af = TRUE;
-+ config |= CLASS_af;
- break;
- }
- case 'A':
- if (*(p + 2) == 'Z')
- {
-- AZ = TRUE;
-+ config |= CLASS_AZ;
- break;
- }
- else
- if (*(p + 2) == 'F')
- {
-- AF = TRUE;
-+ config |= CLASS_AF;
- break;
- }
- /* FALLTHROUGH */
-@@ -480,7 +460,7 @@
- }
- else if (*p == '_')
- {
-- underscore = TRUE;
-+ config |= CLASS_underscore;
- p ++;
- }
- else if (*p == '\n')
-@@ -495,38 +475,45 @@
- if (p != end)
- return FAIL;
-
-- /* build the config that represents the ranges we gathered */
-- STRCPY(myconfig, "000000000");
-- if (not == TRUE)
-- myconfig[0] = '1';
-- if (af == TRUE)
-- myconfig[1] = '1';
-- if (AF == TRUE)
-- myconfig[2] = '1';
-- if (az == TRUE)
-- myconfig[3] = '1';
-- if (AZ == TRUE)
-- myconfig[4] = '1';
-- if (o7 == TRUE)
-- myconfig[5] = '1';
-- if (o9 == TRUE)
-- myconfig[6] = '1';
-- if (underscore == TRUE)
-- myconfig[7] = '1';
- if (newl == TRUE)
-+ extra_newl = ADD_NL;
-+
-+ switch (config)
- {
-- myconfig[8] = '1';
-- extra_newl = ADD_NL;
-+ case CLASS_o9:
-+ return extra_newl + NFA_DIGIT;
-+ case CLASS_not | CLASS_o9:
-+ return extra_newl + NFA_NDIGIT;
-+ case CLASS_af | CLASS_AF | CLASS_o9:
-+ return extra_newl + NFA_HEX;
-+ case CLASS_not | CLASS_af | CLASS_AF | CLASS_o9:
-+ return extra_newl + NFA_NHEX;
-+ case CLASS_o7:
-+ return extra_newl + NFA_OCTAL;
-+ case CLASS_not | CLASS_o7:
-+ return extra_newl + NFA_NOCTAL;
-+ case CLASS_az | CLASS_AZ | CLASS_o9 | CLASS_underscore:
-+ return extra_newl + NFA_WORD;
-+ case CLASS_not | CLASS_az | CLASS_AZ | CLASS_o9 | CLASS_underscore:
-+ return extra_newl + NFA_NWORD;
-+ case CLASS_az | CLASS_AZ | CLASS_underscore:
-+ return extra_newl + NFA_HEAD;
-+ case CLASS_not | CLASS_az | CLASS_AZ | CLASS_underscore:
-+ return extra_newl + NFA_NHEAD;
-+ case CLASS_az | CLASS_AZ:
-+ return extra_newl + NFA_ALPHA;
-+ case CLASS_not | CLASS_az | CLASS_AZ:
-+ return extra_newl + NFA_NALPHA;
-+ case CLASS_az:
-+ return extra_newl + NFA_LOWER;
-+ case CLASS_not | CLASS_az:
-+ return extra_newl + NFA_NLOWER;
-+ case CLASS_AZ:
-+ return extra_newl + NFA_UPPER;
-+ case CLASS_not | CLASS_AZ:
-+ return extra_newl + NFA_NUPPER;
- }
-- /* try to recognize character classes */
-- for (i = 0; i < NCONFIGS; i++)
-- if (STRNCMP(myconfig, config[i], 8) == 0)
-- return classid[i] + extra_newl;
--
-- /* fallthrough => no success so far */
- return FAIL;
--
--#undef NCONFIGS
- }
-
- /*
-@@ -900,7 +887,7 @@
- EMSG_RET_FAIL(_(e_z1_not_allowed));
- EMIT(NFA_ZREF1 + (no_Magic(c) - '1'));
- /* No need to set nfa_has_backref, the sub-matches don't
-- * change when \z1 .. \z9 maches or not. */
-+ * change when \z1 .. \z9 matches or not. */
- re_has_z = REX_USE;
- break;
- case '(':
-@@ -4658,7 +4645,7 @@
- }
- else
- {
-- /* skip ofer the matched characters, set character
-+ /* skip over the matched characters, set character
- * count in NFA_SKIP */
- ll = nextlist;
- add_state = t->state->out;
-diff -r 85c04c7963d1 -r 43de4ebbe7ad src/testdir/test36.in
---- src/testdir/test36.in Tue Jun 04 14:23:05 2013 +0200
-+++ src/testdir/test36.in Tue Jun 04 17:47:05 2013 +0200
-@@ -1,40 +1,105 @@
--Test character classes in regexp
-+Test character classes in regexp using regexpengine 0, 1, 2.
-
- STARTTEST
--/^start-here
--j:s/\d//g
--j:s/\D//g
--j:s/\o//g
--j:s/\O//g
--j:s/\x//g
--j:s/\X//g
--j:s/\w//g
--j:s/\W//g
--j:s/\h//g
--j:s/\H//g
--j:s/\a//g
--j:s/\A//g
--j:s/\l//g
--j:s/\L//g
--j:s/\u//g
--j:s/\U//g
-+/^start-here/+1
-+Y:s/\%#=0\d//g
-+p:s/\%#=1\d//g
-+p:s/\%#=2\d//g
-+p:s/\%#=0[0-9]//g
-+p:s/\%#=1[0-9]//g
-+p:s/\%#=2[0-9]//g
-+p:s/\%#=0\D//g
-+p:s/\%#=1\D//g
-+p:s/\%#=2\D//g
-+p:s/\%#=0[^0-9]//g
-+p:s/\%#=1[^0-9]//g
-+p:s/\%#=2[^0-9]//g
-+p:s/\%#=0\o//g
-+p:s/\%#=1\o//g
-+p:s/\%#=2\o//g
-+p:s/\%#=0[0-7]//g
-+p:s/\%#=1[0-7]//g
-+p:s/\%#=2[0-7]//g
-+p:s/\%#=0\O//g
-+p:s/\%#=1\O//g
-+p:s/\%#=2\O//g
-+p:s/\%#=0[^0-7]//g
-+p:s/\%#=1[^0-7]//g
-+p:s/\%#=2[^0-7]//g
-+p:s/\%#=0\x//g
-+p:s/\%#=1\x//g
-+p:s/\%#=2\x//g
-+p:s/\%#=0[0-9A-Fa-f]//g
-+p:s/\%#=1[0-9A-Fa-f]//g
-+p:s/\%#=2[0-9A-Fa-f]//g
-+p:s/\%#=0\X//g
-+p:s/\%#=1\X//g
-+p:s/\%#=2\X//g
-+p:s/\%#=0[^0-9A-Fa-f]//g
-+p:s/\%#=1[^0-9A-Fa-f]//g
-+p:s/\%#=2[^0-9A-Fa-f]//g
-+p:s/\%#=0\w//g
-+p:s/\%#=1\w//g
-+p:s/\%#=2\w//g
-+p:s/\%#=0[0-9A-Za-z_]//g
-+p:s/\%#=1[0-9A-Za-z_]//g
-+p:s/\%#=2[0-9A-Za-z_]//g
-+p:s/\%#=0\W//g
-+p:s/\%#=1\W//g
-+p:s/\%#=2\W//g
-+p:s/\%#=0[^0-9A-Za-z_]//g
-+p:s/\%#=1[^0-9A-Za-z_]//g
-+p:s/\%#=2[^0-9A-Za-z_]//g
-+p:s/\%#=0\h//g
-+p:s/\%#=1\h//g
-+p:s/\%#=2\h//g
-+p:s/\%#=0[A-Za-z_]//g
-+p:s/\%#=1[A-Za-z_]//g
-+p:s/\%#=2[A-Za-z_]//g
-+p:s/\%#=0\H//g
-+p:s/\%#=1\H//g
-+p:s/\%#=2\H//g
-+p:s/\%#=0[^A-Za-z_]//g
-+p:s/\%#=1[^A-Za-z_]//g
-+p:s/\%#=2[^A-Za-z_]//g
-+p:s/\%#=0\a//g
-+p:s/\%#=1\a//g
-+p:s/\%#=2\a//g
-+p:s/\%#=0[A-Za-z]//g
-+p:s/\%#=1[A-Za-z]//g
-+p:s/\%#=2[A-Za-z]//g
-+p:s/\%#=0\A//g
-+p:s/\%#=1\A//g
-+p:s/\%#=2\A//g
-+p:s/\%#=0[^A-Za-z]//g
-+p:s/\%#=1[^A-Za-z]//g
-+p:s/\%#=2[^A-Za-z]//g
-+p:s/\%#=0\l//g
-+p:s/\%#=1\l//g
-+p:s/\%#=2\l//g
-+p:s/\%#=0[a-z]//g
-+p:s/\%#=1[a-z]//g
-+p:s/\%#=2[a-z]//g
-+p:s/\%#=0\L//g
-+p:s/\%#=1\L//g
-+p:s/\%#=2\L//g
-+p:s/\%#=0[^a-z]//g
-+p:s/\%#=1[^a-z]//g
-+p:s/\%#=2[^a-z]//g
-+p:s/\%#=0\u//g
-+p:s/\%#=1\u//g
-+p:s/\%#=2\u//g
-+p:s/\%#=0[A-Z]//g
-+p:s/\%#=1[A-Z]//g
-+p:s/\%#=2[A-Z]//g
-+p:s/\%#=0\U//g
-+p:s/\%#=1\U//g
-+p:s/\%#=2\U//g
-+p:s/\%#=0[^A-Z]//g
-+p:s/\%#=1[^A-Z]//g
-+p:s/\%#=2[^A-Z]//g
- :/^start-here/+1,$wq! test.out
- ENDTEST
-
- start-here
- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-diff -r 85c04c7963d1 -r 43de4ebbe7ad src/testdir/test36.ok
---- src/testdir/test36.ok Tue Jun 04 14:23:05 2013 +0200
-+++ src/testdir/test36.ok Tue Jun 04 17:47:05 2013 +0200
-@@ -1,16 +1,96 @@
-+ \f\r !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
- \f\r !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
- 0123456789
-+0123456789
-+0123456789
-+0123456789
-+0123456789
-+0123456789
-+ \f\r !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
- \f\r !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
- 01234567
-+01234567
-+01234567
-+01234567
-+01234567
-+01234567
-+ \f\r !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
- \f\r !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
- 0123456789ABCDEFabcdef
-+0123456789ABCDEFabcdef
-+0123456789ABCDEFabcdef
-+0123456789ABCDEFabcdef
-+0123456789ABCDEFabcdef
-+0123456789ABCDEFabcdef
-+ \f\r !"#$%&'()#+'-./:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
- \f\r !"#$%&'()#+'-./:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
- 0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-+0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-+0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-+0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-+0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-+0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
- \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\7f\80\82\90\9b¦±¼ÇÓé
- ABCDEFGHIXYZ_abcdefghiwxyz
-+ABCDEFGHIXYZ_abcdefghiwxyz
-+ABCDEFGHIXYZ_abcdefghiwxyz
-+ABCDEFGHIXYZ_abcdefghiwxyz
-+ABCDEFGHIXYZ_abcdefghiwxyz
-+ABCDEFGHIXYZ_abcdefghiwxyz
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
- \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
- ABCDEFGHIXYZabcdefghiwxyz
-+ABCDEFGHIXYZabcdefghiwxyz
-+ABCDEFGHIXYZabcdefghiwxyz
-+ABCDEFGHIXYZabcdefghiwxyz
-+ABCDEFGHIXYZabcdefghiwxyz
-+ABCDEFGHIXYZabcdefghiwxyz
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
- \f\r !"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\7f\80\82\90\9b¦±¼ÇÓé
- abcdefghiwxyz
-+abcdefghiwxyz
-+abcdefghiwxyz
-+abcdefghiwxyz
-+abcdefghiwxyz
-+abcdefghiwxyz
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
-+ \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
- \f\r !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\7f\80\82\90\9b¦±¼ÇÓé
- ABCDEFGHIXYZ
-+ABCDEFGHIXYZ
-+ABCDEFGHIXYZ
-+ABCDEFGHIXYZ
-+ABCDEFGHIXYZ
-+ABCDEFGHIXYZ
-diff -r 85c04c7963d1 -r 43de4ebbe7ad src/version.c
---- src/version.c Tue Jun 04 14:23:05 2013 +0200
-+++ src/version.c Tue Jun 04 17:47:05 2013 +0200
-@@ -729,6 +729,8 @@
- static int included_patches[] =
- { /* Add new patch number below this line */
- /**/
-+ 1111,
-+/**/
- 1110,
- /**/
- 1109,
+++ /dev/null
-diff -up vim73/runtime/doc/eval.txt.780 vim73/runtime/doc/eval.txt
---- vim73/runtime/doc/eval.txt.780 2013-01-28 13:41:04.000000000 +0100
-+++ runtime/doc/eval.txt 2013-01-28 13:44:58.000000000 +0100
-@@ -1705,7 +1705,7 @@ call( {func}, {arglist} [, {dict}])
- any call {func} with arguments {arglist}
- ceil( {expr}) Float round {expr} up
- changenr() Number current change number
--char2nr( {expr}) Number ASCII value of first char in {expr}
-+char2nr( {expr}[, {utf8}]) Number ASCII/UTF8 value of first char in {expr}
- cindent( {lnum}) Number C indent for line {lnum}
- clearmatches() none clear all matches
- col( {expr}) Number column nr of cursor or mark
-@@ -1862,7 +1862,7 @@ mkdir( {name} [, {path} [, {prot}]])
- mode( [expr]) String current editing mode
- mzeval( {expr}) any evaluate |MzScheme| expression
- nextnonblank( {lnum}) Number line nr of non-blank line >= {lnum}
--nr2char( {expr}) String single char with ASCII value {expr}
-+nr2char( {expr}[, {utf8}]) String single char with ASCII/UTF8 value {expr}
- or( {expr}, {expr}) Number bitwise OR
- pathshorten( {expr}) String shorten directory names in a path
- pow( {x}, {y}) Float {x} to the power of {y}
-@@ -2282,13 +2282,17 @@ changenr() *changenr()*
- redo it is the number of the redone change. After undo it is
- one less than the number of the undone change.
-
--char2nr({expr}) *char2nr()*
-+char2nr({expr}[, {utf8}]) **char2nr()*
- Return number value of the first char in {expr}. Examples: >
- char2nr(" ") returns 32
- char2nr("ABC") returns 65
--< The current 'encoding' is used. Example for "utf-8": >
-+< When {utf8} is omitted or zero, the current 'encoding' is
-+used.
-+ Example for "utf-8": >
- char2nr("á") returns 225
- char2nr("á"[0]) returns 195
-+ With {utf8} set to 1, always treat as utf-8 characters.
-+ A combining character is a separate character.
- < |nr2char()| does the opposite.
-
- cindent({lnum}) *cindent()*
-diff -up vim73/src/eval.c.780 vim73/src/eval.c
---- vim73/src/eval.c.780 2013-01-28 13:41:04.000000000 +0100
-+++ src/eval.c 2013-01-28 13:41:04.000000000 +0100
-@@ -7854,7 +7854,7 @@ static struct fst
- {"ceil", 1, 1, f_ceil},
- #endif
- {"changenr", 0, 0, f_changenr},
-- {"char2nr", 1, 1, f_char2nr},
-+ {"char2nr", 1, 2, f_char2nr},
- {"cindent", 1, 1, f_cindent},
- {"clearmatches", 0, 0, f_clearmatches},
- {"col", 1, 1, f_col},
-@@ -8003,7 +8003,7 @@ static struct fst
- {"mzeval", 1, 1, f_mzeval},
- #endif
- {"nextnonblank", 1, 1, f_nextnonblank},
-- {"nr2char", 1, 1, f_nr2char},
-+ {"nr2char", 1, 2, f_nr2char},
- {"or", 2, 2, f_or},
- {"pathshorten", 1, 1, f_pathshorten},
- #ifdef FEAT_FLOAT
-@@ -9303,7 +9303,17 @@ f_char2nr(argvars, rettv)
- {
- #ifdef FEAT_MBYTE
- if (has_mbyte)
-- rettv->vval.v_number = (*mb_ptr2char)(get_tv_string(&argvars[0]));
-+ {
-+ int utf8 = 0;
-+
-+ if (argvars[1].v_type != VAR_UNKNOWN)
-+ utf8 = get_tv_number_chk(&argvars[1], NULL);
-+
-+ if (utf8)
-+ rettv->vval.v_number = (*utf_ptr2char)(get_tv_string(&argvars[0]));
-+ else
-+ rettv->vval.v_number = (*mb_ptr2char)(get_tv_string(&argvars[0]));
-+ }
- else
- #endif
- rettv->vval.v_number = get_tv_string(&argvars[0])[0];
-@@ -14360,7 +14370,16 @@ f_nr2char(argvars, rettv)
-
- #ifdef FEAT_MBYTE
- if (has_mbyte)
-- buf[(*mb_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
-+ {
-+ int utf8 = 0;
-+
-+ if (argvars[1].v_type != VAR_UNKNOWN)
-+ utf8 = get_tv_number_chk(&argvars[1], NULL);
-+ if (utf8)
-+ buf[(*utf_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
-+ else
-+ buf[(*mb_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
-+ }
- else
- #endif
- {
-diff -up vim73/src/version.c.780 vim73/src/version.c
---- vim73/src/version.c.780 2013-01-28 13:41:04.000000000 +0100
-+++ src/version.c 2013-01-28 13:41:04.000000000 +0100
-@@ -726,6 +726,8 @@ static char *(features[]) =
- static int included_patches[] =
- { /* Add new patch number below this line */
- /**/
-+ 780,
-+/**/
- 779,
- /**/
- 778,
projects / packages / vim.git / commitdiff