aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.3.873

Browse Source 
Problem:    Cannot easily use :s to make title case.
Solution:   Have "\L\u" result in title case. (James McCoy)
This commit is contained in:
Bram Moolenaar
2013-03-19 17:42:15 +01:00
parent 71afbfe6cd
commit c2c355df6f
6 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/regexp.c
View File

@@ -7185,7 +7185,8 @@ vim_regsub_both(source, dest, copy, magic, backslash)
int c;
int cc;
int no = -1;
fptr_T func = (fptr_T)NULL;
fptr_T func_all = (fptr_T)NULL;
fptr_T func_one = (fptr_T)NULL;
linenr_T clnum = 0; /* init for GCC */
int len = 0; /* init for GCC */
#ifdef FEAT_EVAL
@@ -7318,16 +7319,16 @@ vim_regsub_both(source, dest, copy, magic, backslash)
{
switch (*src++)
{
case 'u': func = (fptr_T)do_upper;
case 'u': func_one = (fptr_T)do_upper;
continue;
case 'U': func = (fptr_T)do_Upper;
case 'U': func_all = (fptr_T)do_Upper;
continue;
case 'l': func = (fptr_T)do_lower;
case 'l': func_one = (fptr_T)do_lower;
continue;
case 'L': func = (fptr_T)do_Lower;
case 'L': func_all = (fptr_T)do_Lower;
continue;
case 'e':
case 'E': func = (fptr_T)NULL;
case 'E': func_one = func_all = (fptr_T)NULL;
continue;
}
}
@@ -7380,11 +7381,14 @@ vim_regsub_both(source, dest, copy, magic, backslash)
#endif
/* Write to buffer, if copy is set. */
if (func == (fptr_T)NULL) /* just copy */
cc = c;
else
if (func_one != (fptr_T)NULL)
/* Turbo C complains without the typecast */
func = (fptr_T)(func(&cc, c));
func_one = (fptr_T)(func_one(&cc, c));
else if (func_all != (fptr_T)NULL)
/* Turbo C complains without the typecast */
func_all = (fptr_T)(func_all(&cc, c));
else /* just copy */
cc = c;
#ifdef FEAT_MBYTE
if (has_mbyte)
@@ -7495,11 +7499,14 @@ vim_regsub_both(source, dest, copy, magic, backslash)
#endif
c = *s;
if (func == (fptr_T)NULL) /* just copy */
cc = c;
else
if (func_one != (fptr_T)NULL)
/* Turbo C complains without the typecast */
func = (fptr_T)(func(&cc, c));
func_one = (fptr_T)(func_one(&cc, c));
else if (func_all != (fptr_T)NULL)
/* Turbo C complains without the typecast */
func_all = (fptr_T)(func_all(&cc, c));
else /* just copy */
cc = c;
#ifdef FEAT_MBYTE
if (has_mbyte)

BIN
src/testdir/test79.in
View File

Binary file not shown.

BIN
src/testdir/test79.ok
View File

Binary file not shown.

4
src/testdir/test80.in
View File

@@ -35,6 +35,8 @@ STARTTEST
:$put =substitute('sSs', 'S', '\c', '')
:$put =substitute('uUu', 'U', \"\n\", '')
:$put =substitute('vVv', 'V', \"\b\", '')
:$put =substitute('wWw', 'W', \"\\\", '')
:$put =substitute('xXx', 'X', \"\r\", '')
:$put =substitute('Y', 'Y', '\L\uyYy\l\EY', '')
:$put =substitute('Z', 'Z', '\U\lZzZ\u\Ez', '')
/^TEST_2
@@ -67,6 +69,8 @@ STARTTEST
:$put =substitute('qQq', 'Q', '\t', '')
:$put =substitute('rRr', 'R', '\\', '')
:$put =substitute('sSs', 'S', '\c', '')
:$put =substitute('tTt', 'T', \"\r\", '')
:$put =substitute('uUu', 'U', \"\n\", '')
:$put =substitute('vVv', 'V', \"\b\", '')
:$put =substitute('wWw', 'W', \"\\\", '')
:$put =substitute('X', 'X', '\L\uxXx\l\EX', '')

4
src/testdir/test80.ok
View File

@@ -27,6 +27,8 @@ u
scs
u
u
vv
w\w
x
x
YyyY
@@ -55,6 +57,8 @@ u
o
pp
q q
r\r
scs
t
t
u

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
873,
/**/
872,
/**/