Skip to content

Commit 5379398

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents f8dd3eb + d10abe5 commit 5379398

8 files changed

Lines changed: 109 additions & 67 deletions

File tree

‎src/auto/configure‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,6 @@ with_tclsh
814814
enable_rubyinterp
815815
with_ruby_command
816816
enable_cscope
817-
enable_termtruecolor
818817
enable_workshop
819818
enable_netbeans
820819
enable_channel
@@ -1483,7 +1482,6 @@ Optional Features:
14831482
--enable-tclinterp=OPTS Include Tcl interpreter. default=no OPTS=no/yes/dynamic
14841483
--enable-rubyinterp=OPTS Include Ruby interpreter. default=no OPTS=no/yes/dynamic
14851484
--enable-cscope Include cscope interface.
1486-
--enable-termtruecolor Include support for 24-bit colors in ISO-8613-3 compatible terminals
14871485
--enable-workshop Include Sun Visual Workshop support.
14881486
--disable-netbeans Disable NetBeans integration support.
14891487
--disable-channel Disable process communication support.
@@ -7302,22 +7300,6 @@ if test "$enable_cscope" = "yes"; then
73027300

73037301
fi
73047302

7305-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-termtruecolor argument" >&5
7306-
$as_echo_n "checking --enable-termtruecolor argument... " >&6; }
7307-
# Check whether --enable-termtruecolor was given.
7308-
if test "${enable_termtruecolor+set}" = set; then :
7309-
enableval=$enable_termtruecolor;
7310-
else
7311-
enable_termtruecolor="no"
7312-
fi
7313-
7314-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_termtruecolor" >&5
7315-
$as_echo "$enable_termtruecolor" >&6; }
7316-
if test "$enable_termtruecolor" = "yes"; then
7317-
$as_echo "#define FEAT_TERMTRUECOLOR 1" >>confdefs.h
7318-
7319-
fi
7320-
73217303
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-workshop argument" >&5
73227304
$as_echo_n "checking --enable-workshop argument... " >&6; }
73237305
# Check whether --enable-workshop was given.

‎src/config.h.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,6 @@
362362
/* Define for linking via dlopen() or LoadLibrary() */
363363
#undef DYNAMIC_TCL
364364

365-
/* Define if you want 24-bit colors in ISO-8613-3 compatible terminals. */
366-
#undef FEAT_TERMTRUECOLOR
367-
368365
/* Define if you want to add support for ACL */
369366
#undef HAVE_POSIX_ACL
370367
#undef HAVE_SOLARIS_ZFS_ACL

‎src/configure.in‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,15 +1979,6 @@ if test "$enable_cscope" = "yes"; then
19791979
AC_DEFINE(FEAT_CSCOPE)
19801980
fi
19811981

1982-
AC_MSG_CHECKING(--enable-termtruecolor argument)
1983-
AC_ARG_ENABLE(termtruecolor,
1984-
[ --enable-termtruecolor Include support for 24-bit colors in ISO-8613-3 compatible terminals], ,
1985-
[enable_termtruecolor="no"])
1986-
AC_MSG_RESULT($enable_termtruecolor)
1987-
if test "$enable_termtruecolor" = "yes"; then
1988-
AC_DEFINE(FEAT_TERMTRUECOLOR)
1989-
fi
1990-
19911982
AC_MSG_CHECKING(--enable-workshop argument)
19921983
AC_ARG_ENABLE(workshop,
19931984
[ --enable-workshop Include Sun Visual Workshop support.], ,

‎src/feature.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,13 @@
822822
# endif
823823
#endif
824824

825+
/*
826+
* +termtruecolor 'guicolor' option.
827+
*/
828+
#if (defined(FEAT_BIG) && defined(FEAT_SYN_HL)) && !defined(ALWAYS_USE_GUI)
829+
# define FEAT_TERMTRUECOLOR
830+
#endif
831+
825832
/* Mac specific thing: Codewarrior interface. */
826833
#ifdef FEAT_GUI_MAC
827834
# define FEAT_CW_EDITOR

‎src/regexp.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2544,12 +2544,12 @@ regatom(int *flagp)
25442544
case CLASS_ALNUM:
25452545
for (cu = 1; cu <= 255; cu++)
25462546
if (isalnum(cu))
2547-
regc(cu);
2547+
regmbc(cu);
25482548
break;
25492549
case CLASS_ALPHA:
25502550
for (cu = 1; cu <= 255; cu++)
25512551
if (isalpha(cu))
2552-
regc(cu);
2552+
regmbc(cu);
25532553
break;
25542554
case CLASS_BLANK:
25552555
regc(' ');
@@ -2558,32 +2558,32 @@ regatom(int *flagp)
25582558
case CLASS_CNTRL:
25592559
for (cu = 1; cu <= 255; cu++)
25602560
if (iscntrl(cu))
2561-
regc(cu);
2561+
regmbc(cu);
25622562
break;
25632563
case CLASS_DIGIT:
25642564
for (cu = 1; cu <= 255; cu++)
25652565
if (VIM_ISDIGIT(cu))
2566-
regc(cu);
2566+
regmbc(cu);
25672567
break;
25682568
case CLASS_GRAPH:
25692569
for (cu = 1; cu <= 255; cu++)
25702570
if (isgraph(cu))
2571-
regc(cu);
2571+
regmbc(cu);
25722572
break;
25732573
case CLASS_LOWER:
25742574
for (cu = 1; cu <= 255; cu++)
25752575
if (MB_ISLOWER(cu))
2576-
regc(cu);
2576+
regmbc(cu);
25772577
break;
25782578
case CLASS_PRINT:
25792579
for (cu = 1; cu <= 255; cu++)
25802580
if (vim_isprintc(cu))
2581-
regc(cu);
2581+
regmbc(cu);
25822582
break;
25832583
case CLASS_PUNCT:
25842584
for (cu = 1; cu <= 255; cu++)
25852585
if (ispunct(cu))
2586-
regc(cu);
2586+
regmbc(cu);
25872587
break;
25882588
case CLASS_SPACE:
25892589
for (cu = 9; cu <= 13; cu++)
@@ -2593,12 +2593,12 @@ regatom(int *flagp)
25932593
case CLASS_UPPER:
25942594
for (cu = 1; cu <= 255; cu++)
25952595
if (MB_ISUPPER(cu))
2596-
regc(cu);
2596+
regmbc(cu);
25972597
break;
25982598
case CLASS_XDIGIT:
25992599
for (cu = 1; cu <= 255; cu++)
26002600
if (vim_isxdigit(cu))
2601-
regc(cu);
2601+
regmbc(cu);
26022602
break;
26032603
case CLASS_TAB:
26042604
regc('\t');

‎src/term.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,18 +1274,18 @@ struct rgbcolor_table_S {
12741274

12751275
static struct rgbcolor_table_S rgb_table[] = {
12761276
{(char_u *)"black", RGB(0x00, 0x00, 0x00)},
1277-
{(char_u *)"blue", RGB(0x00, 0x00, 0xD4)},
1278-
{(char_u *)"brown", RGB(0x80, 0x40, 0x40)},
1279-
{(char_u *)"cyan", RGB(0x02, 0xAB, 0xEA)},
1280-
{(char_u *)"darkblue", RGB(0x00, 0x00, 0x80)},
1281-
{(char_u *)"darkcyan", RGB(0x00, 0x80, 0x80)},
1282-
{(char_u *)"darkgray", RGB(0x80, 0x80, 0x80)},
1283-
{(char_u *)"darkgreen", RGB(0x00, 0x80, 0x00)},
1284-
{(char_u *)"darkgrey", RGB(0x80, 0x80, 0x80)},
1285-
{(char_u *)"darkmagenta", RGB(0x80, 0x00, 0x80)},
1286-
{(char_u *)"darkred", RGB(0x80, 0x00, 0x00)},
1287-
{(char_u *)"darkyellow", RGB(0xBB, 0xBB, 0x00)},
1288-
{(char_u *)"gray", RGB(0xC0, 0xC0, 0xC0)},
1277+
{(char_u *)"blue", RGB(0x00, 0x00, 0xFF)},
1278+
{(char_u *)"brown", RGB(0xA5, 0x2A, 0x2A)},
1279+
{(char_u *)"cyan", RGB(0x00, 0xFF, 0xFF)},
1280+
{(char_u *)"darkblue", RGB(0x00, 0x00, 0x8B)},
1281+
{(char_u *)"darkcyan", RGB(0x00, 0x8B, 0x8B)},
1282+
{(char_u *)"darkgray", RGB(0xA9, 0xA9, 0xA9)},
1283+
{(char_u *)"darkgreen", RGB(0x00, 0x64, 0x00)},
1284+
{(char_u *)"darkgrey", RGB(0xA9, 0xA9, 0xA9)},
1285+
{(char_u *)"darkmagenta", RGB(0x8B, 0x00, 0x8B)},
1286+
{(char_u *)"darkred", RGB(0x8B, 0x00, 0x00)},
1287+
{(char_u *)"darkyellow", RGB(0x8B, 0x8B, 0x00)}, /* No X11 */
1288+
{(char_u *)"gray", RGB(0xBE, 0xBE, 0xBE)},
12891289
{(char_u *)"gray10", RGB(0x1A, 0x1A, 0x1A)},
12901290
{(char_u *)"gray20", RGB(0x33, 0x33, 0x33)},
12911291
{(char_u *)"gray30", RGB(0x4D, 0x4D, 0x4D)},
@@ -1295,8 +1295,8 @@ static struct rgbcolor_table_S rgb_table[] = {
12951295
{(char_u *)"gray70", RGB(0xB3, 0xB3, 0xB3)},
12961296
{(char_u *)"gray80", RGB(0xCC, 0xCC, 0xCC)},
12971297
{(char_u *)"gray90", RGB(0xE5, 0xE5, 0xE5)},
1298-
{(char_u *)"green", RGB(0x00, 0x64, 0x11)},
1299-
{(char_u *)"grey", RGB(0xC0, 0xC0, 0xC0)},
1298+
{(char_u *)"green", RGB(0x00, 0xFF, 0x00)},
1299+
{(char_u *)"grey", RGB(0xBE, 0xBE, 0xBE)},
13001300
{(char_u *)"grey10", RGB(0x1A, 0x1A, 0x1A)},
13011301
{(char_u *)"grey20", RGB(0x33, 0x33, 0x33)},
13021302
{(char_u *)"grey30", RGB(0x4D, 0x4D, 0x4D)},
@@ -1306,23 +1306,23 @@ static struct rgbcolor_table_S rgb_table[] = {
13061306
{(char_u *)"grey70", RGB(0xB3, 0xB3, 0xB3)},
13071307
{(char_u *)"grey80", RGB(0xCC, 0xCC, 0xCC)},
13081308
{(char_u *)"grey90", RGB(0xE5, 0xE5, 0xE5)},
1309-
{(char_u *)"lightblue", RGB(0xA0, 0xA0, 0xFF)},
1310-
{(char_u *)"lightcyan", RGB(0xA0, 0xFF, 0xFF)},
1311-
{(char_u *)"lightgray", RGB(0xE0, 0xE0, 0xE0)},
1312-
{(char_u *)"lightgreen", RGB(0xA0, 0xFF, 0xA0)},
1313-
{(char_u *)"lightgrey", RGB(0xE0, 0xE0, 0xE0)},
1314-
{(char_u *)"lightmagenta",RGB(0xF0, 0xA0, 0xF0)},
1315-
{(char_u *)"lightred", RGB(0xFF, 0xA0, 0xA0)},
1316-
{(char_u *)"lightyellow", RGB(0xFF, 0xFF, 0xA0)},
1317-
{(char_u *)"magenta", RGB(0xF2, 0x08, 0x84)},
1318-
{(char_u *)"orange", RGB(0xFC, 0x80, 0x00)},
1309+
{(char_u *)"lightblue", RGB(0xAD, 0xD8, 0xE6)},
1310+
{(char_u *)"lightcyan", RGB(0xE0, 0xFF, 0xFF)},
1311+
{(char_u *)"lightgray", RGB(0xD3, 0xD3, 0xD3)},
1312+
{(char_u *)"lightgreen", RGB(0x90, 0xEE, 0x90)},
1313+
{(char_u *)"lightgrey", RGB(0xD3, 0xD3, 0xD3)},
1314+
{(char_u *)"lightmagenta", RGB(0xFF, 0x8B, 0xFF)}, /* No X11 */
1315+
{(char_u *)"lightred", RGB(0xFF, 0x8B, 0x8B)}, /* No X11 */
1316+
{(char_u *)"lightyellow", RGB(0xFF, 0xFF, 0xE0)},
1317+
{(char_u *)"magenta", RGB(0xFF, 0x00, 0xFF)},
1318+
{(char_u *)"orange", RGB(0xFF, 0xA5, 0x00)},
13191319
{(char_u *)"purple", RGB(0xA0, 0x20, 0xF0)},
1320-
{(char_u *)"red", RGB(0xDD, 0x08, 0x06)},
1320+
{(char_u *)"red", RGB(0xFF, 0x00, 0x00)},
13211321
{(char_u *)"seagreen", RGB(0x2E, 0x8B, 0x57)},
13221322
{(char_u *)"slateblue", RGB(0x6A, 0x5A, 0xCD)},
1323-
{(char_u *)"violet", RGB(0x8D, 0x38, 0xC9)},
1323+
{(char_u *)"violet", RGB(0xEE, 0x82, 0xEE)},
13241324
{(char_u *)"white", RGB(0xFF, 0xFF, 0xFF)},
1325-
{(char_u *)"yellow", RGB(0xFC, 0xF3, 0x05)},
1325+
{(char_u *)"yellow", RGB(0xFF, 0xFF, 0x00)},
13261326
};
13271327

13281328
static int

‎src/testdir/test_regexp_utf8.vim‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,60 @@ func Test_equivalence_re2()
3333
set re=2
3434
call s:equivalence_test()
3535
endfunc
36+
37+
func s:classes_test()
38+
set isprint=@,161-255
39+
call assert_equal('Motörhead', matchstr('Motörhead', '[[:print:]]\+'))
40+
41+
let alphachars = ''
42+
let lowerchars = ''
43+
let upperchars = ''
44+
let alnumchars = ''
45+
let printchars = ''
46+
let punctchars = ''
47+
let xdigitchars = ''
48+
let i = 1
49+
while i <= 255
50+
let c = nr2char(i)
51+
if c =~ '[[:alpha:]]'
52+
let alphachars .= c
53+
endif
54+
if c =~ '[[:lower:]]'
55+
let lowerchars .= c
56+
endif
57+
if c =~ '[[:upper:]]'
58+
let upperchars .= c
59+
endif
60+
if c =~ '[[:alnum:]]'
61+
let alnumchars .= c
62+
endif
63+
if c =~ '[[:print:]]'
64+
let printchars .= c
65+
endif
66+
if c =~ '[[:punct:]]'
67+
let punctchars .= c
68+
endif
69+
if c =~ '[[:xdigit:]]'
70+
let xdigitchars .= c
71+
endif
72+
let i += 1
73+
endwhile
74+
75+
call assert_equal('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', alphachars)
76+
call assert_equal('abcdefghijklmnopqrstuvwxyzµßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ', lowerchars)
77+
call assert_equal('ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ', upperchars)
78+
call assert_equal('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', alnumchars)
79+
call assert_equal(' !"#$%&''()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ', printchars)
80+
call assert_equal('!"#$%&''()*+,-./:;<=>?@[\]^_`{|}~', punctchars)
81+
call assert_equal('0123456789ABCDEFabcdef', xdigitchars)
82+
endfunc
83+
84+
func Test_classes_re1()
85+
set re=1
86+
call s:classes_test()
87+
endfunc
88+
89+
func Test_classes_re2()
90+
set re=2
91+
call s:classes_test()
92+
endfunc

‎src/version.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,14 @@ static char *(features[]) =
768768

769769
static int included_patches[] =
770770
{ /* Add new patch number below this line */
771+
/**/
772+
1786,
773+
/**/
774+
1785,
775+
/**/
776+
1784,
777+
/**/
778+
1783,
771779
/**/
772780
1782,
773781
/**/

0 commit comments

Comments
 (0)