patch 9.0.0111: "nocombine" is missing from synIDattr()
Problem: "nocombine" is missing from synIDattr().
Solution: Add "nocombine". (Muni Tanjim, closes #10816)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 1505418..9b09caa 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -10083,8 +10083,11 @@
p = highlight_has_attr(id, HL_ITALIC, modec);
break;
- case 'n': // name
- p = get_highlight_name_ext(NULL, id - 1, FALSE);
+ case 'n':
+ if (TOLOWER_ASC(what[1]) == 'o') // nocombine
+ p = highlight_has_attr(id, HL_NOCOMBINE, modec);
+ else // name
+ p = get_highlight_name_ext(NULL, id - 1, FALSE);
break;
case 'r': // reverse
diff --git a/src/testdir/test_syn_attr.vim b/src/testdir/test_syn_attr.vim
index 366f39f..bf4dfbc 100644
--- a/src/testdir/test_syn_attr.vim
+++ b/src/testdir/test_syn_attr.vim
@@ -22,8 +22,10 @@
call assert_equal('1', synIDattr(hlID("Mine"), "underdotted", 'cterm'))
call assert_equal('1', synIDattr("Mine"->hlID(), "underdashed", 'gui'))
- hi Mine gui=strikethrough
+ hi Mine term=nocombine gui=strikethrough
call assert_equal('1', synIDattr(hlID("Mine"), "strikethrough", 'gui'))
+ call assert_equal('1', synIDattr(hlID("Mine"), "nocombine", 'term'))
+ call assert_equal('', synIDattr(hlID("Mine"), "nocombine", 'gui'))
hi Mine term=NONE cterm=NONE gui=NONE
call assert_equal('', synIDattr(hlID("Mine"), "bold", 'term'))
call assert_equal('', synIDattr(hlID("Mine"), "italic", 'cterm'))
diff --git a/src/version.c b/src/version.c
index c3b5b65..3ba672d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 111,
+/**/
110,
/**/
109,