# HG changeset patch # User Bram Moolenaar # Date 1659189602 -7200 # Node ID 9b8ab82e3b0b249bf550a056af4a8d861367b02d # Parent 73c769741c528f0c7f7193f490b587f170bddeb0 patch 9.0.0111: "nocombine" is missing from synIDattr() Commit: https://github.com/vim/vim/commit/de78632c41d870d5254e9ccd285f53674b955f4e Author: Bram Moolenaar Date: Sat Jul 30 14:56:17 2022 +0100 patch 9.0.0111: "nocombine" is missing from synIDattr() Problem: "nocombine" is missing from synIDattr(). Solution: Add "nocombine". (Muni Tanjim, closes https://github.com/vim/vim/issues/10816) diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -9233,6 +9233,7 @@ synIDattr({synID}, {what} [, {mode}]) "underline" "1" if underlined "undercurl" "1" if undercurled "strike" "1" if strikethrough + "nocombine" "1" if nocombine Returns an empty string on error. diff --git a/src/evalfunc.c b/src/evalfunc.c --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -10083,8 +10083,11 @@ f_synIDattr(typval_T *argvars UNUSED, ty 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 --- a/src/testdir/test_syn_attr.vim +++ b/src/testdir/test_syn_attr.vim @@ -22,8 +22,10 @@ func Test_missing_attr() 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 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 111, +/**/ 110, /**/ 109,