vim-patch:7.4.1740

Problem:    syn-cchar defined with matchadd() does not appear if there are no
            other syntax definitions which matches buffer text.
Solution:   Check for startcol. (Ozaki Kiichi, haya14busa, closes vim/vim#757)

4d58502202

src/nvim/screen.c

@@ -2210,8 +2210,8 @@ win_line (
                                         ///< force wrapping
   int vcol_off        = 0;              ///< offset for concealed characters
   int did_wcol        = false;
-  int match_conc      = false;          ///< cchar for match functions
+  int match_conc      = 0;              ///< cchar for match functions
-  int has_match_conc  = false;          ///< match wants to conceal
+  int has_match_conc  = 0;              ///< match wants to conceal
   int old_boguscols = 0;
 # define VCOL_HLC (vcol - vcol_off)
 # define FIX_FOR_BOGUSCOLS \
@@ -2656,7 +2656,7 @@ win_line (
 
   // Repeat for the whole displayed line.
   for (;; ) {
-    has_match_conc = false;
+    has_match_conc = 0;
     // Skip this quickly when working on the text.
     if (draw_state != WL_LINE) {
       if (draw_state == WL_CMDLINE - 1 && n_extra == 0) {
@@ -2906,10 +2906,10 @@ win_line (
               shl->attr_cur = shl->attr;
               if (cur != NULL && syn_name2id((char_u *)"Conceal")
                   == cur->hlg_id) {
-                has_match_conc = true;
+                has_match_conc = v == (long)shl->startcol ? 2 : 1;
                 match_conc = cur->conceal_char;
               } else {
-                has_match_conc = match_conc = false;
+                has_match_conc = match_conc = 0;
               }
             } else if (v == (long)shl->endcol) {
               shl->attr_cur = 0;
@@ -3633,11 +3633,11 @@ win_line (
       if (wp->w_p_cole > 0
           && (wp != curwin || lnum != wp->w_cursor.lnum
               || conceal_cursor_line(wp))
-          && ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc)
+          && ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0)
           && !(lnum_in_visual_area
                && vim_strchr(wp->w_p_cocu, 'v') == NULL)) {
         char_attr = conceal_attr;
-        if (prev_syntax_id != syntax_seqnr
+        if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1)
             && (syn_get_sub_char() != NUL || match_conc
                 || wp->w_p_cole == 1)
             && wp->w_p_cole != 3) {

src/nvim/testdir/Makefile

@@ -41,6 +41,7 @@ NEW_TESTS = \
 	    test_viml.res \
 	    test_visual.res \
 	    test_window_id.res \
+	    test_matchadd_conceal.res \
 	    test_alot.res
 
 SCRIPTS_GUI := test16.out

src/nvim/testdir/test_alot.vim

@@ -10,3 +10,4 @@ source test_popup.vim
 source test_regexp_utf8.vim
 source test_syn_attr.vim
 source test_unlet.vim
+source test_matchadd_conceal_utf8.vim

src/nvim/testdir/test_matchadd_conceal.vim

@@ -0,0 +1,262 @@
+" Test for matchadd() and conceal feature
+if !has('conceal')
+  finish
+endif
+
+function! s:screenline(lnum) abort
+  let line = []
+  for c in range(1, winwidth(0))
+    call add(line, nr2char(screenchar(a:lnum, c)))
+  endfor
+  return s:trim(join(line, ''))
+endfunction
+
+function! s:trim(str) abort
+  return matchstr(a:str,'^\s*\zs.\{-}\ze\s*$')
+endfunction
+
+function! Test_simple_matchadd()
+  new
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '# This is a Test'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ')
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  quit!
+endfunction
+
+function! Test_simple_matchadd_and_conceal()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#XThisXisXaXTest'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'X'})
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  quit!
+endfunction
+
+function! Test_matchadd_and_conceallevel_3()
+  new
+
+  setlocal conceallevel=3
+  " set filetype and :syntax on to change screenattr()
+  setlocal filetype=conf
+  syntax on
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#ThisisaTest'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'X'})
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  " more matchadd()
+  "             1234567890123456
+  let expect = '#Thisisa Test'
+
+  call matchadd('ErrorMsg', '\%2l Test', 20, -1, {'conceal': 'X'})
+  redraw!
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_equal(screenattr(lnum, 1) , screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2) , screenattr(lnum, 7))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 10), screenattr(lnum, 12))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 16))
+  call assert_notequal(screenattr(lnum, 10), screenattr(lnum, 16))
+
+  syntax off
+  quit!
+endfunction
+
+function! Test_default_conceal_char()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '# This is a Test'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {})
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  "             1234567890123456
+  let expect = '#+This+is+a+Test'
+  let listchars_save = &listchars
+  set listchars=conceal:+
+  redraw!
+
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  let &listchars = listchars_save
+  quit!
+endfunction
+
+function! Test_syn_and_match_conceal()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#ZThisZisZaZTest'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'Z'})
+  syntax match MyConceal /\%2l / conceal containedin=ALL cchar=*
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  "             1234567890123456
+  let expect = '#*This*is*a*Test'
+  call clearmatches()
+  redraw!
+
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  syntax off
+  quit!
+endfunction
+
+function! Test_clearmatches()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '# This is a Test'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'Z'})
+  let a = getmatches()
+  call clearmatches()
+  redraw!
+
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  " reset match using setmatches()
+  "             1234567890123456
+  let expect = '#ZThisZisZaZTest'
+  call setmatches(a)
+  redraw!
+
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+  call assert_equal({'group': 'Conceal', 'pattern': '\%2l ', 'priority': 10, 'id': a[0].id, 'conceal': 'Z'}, a[0])
+
+  quit!
+endfunction
+
+function! Test_using_matchaddpos()
+  new
+  setlocal concealcursor=n conceallevel=1
+  " set filetype and :syntax on to change screenattr()
+  setlocal filetype=conf
+  syntax on
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#Pis a Test'
+
+  call cursor(1, 1)
+  call matchaddpos('Conceal', [[2,2,6]], 10, -1, {'conceal': 'P'})
+  let a = getmatches()
+  redraw!
+
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 2))
+  call assert_notequal(screenattr(lnum, 2) , screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 1) , screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 1) , screenattr(lnum, 10))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 12))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 16))
+  call assert_equal(screenattr(lnum, 12), screenattr(lnum, 16))
+  call assert_equal({'group': 'Conceal', 'id': a[0].id, 'priority': 10, 'pos1': [2, 2, 6], 'conceal': 'P'}, a[0])
+
+  syntax off
+  quit!
+endfunction
+
+function! Test_matchadd_repeat_conceal_with_syntax_off()
+  new
+
+  " To test targets in the same line string is replaced with conceal char
+  " correctly, repeat 'TARGET'
+  1put ='TARGET_TARGETTARGET'
+  call cursor(1, 1)
+  redraw
+  call assert_equal('TARGET_TARGETTARGET', s:screenline(2))
+
+  setlocal conceallevel=2
+  call matchadd('Conceal', 'TARGET', 10, -1, {'conceal': 't'})
+
+  redraw
+  call assert_equal('t_tt', s:screenline(2))
+
+  quit!
+endfunction

src/nvim/testdir/test_matchadd_conceal_utf8.vim

@@ -0,0 +1,39 @@
+" Test for matchadd() and conceal feature using utf-8.
+if !has('conceal') || !has('multi_byte')
+  finish
+endif
+
+function! s:screenline(lnum) abort
+  let line = []
+  for c in range(1, winwidth(0))
+    call add(line, nr2char(screenchar(a:lnum, c)))
+  endfor
+  return s:trim(join(line, ''))
+endfunction
+
+function! s:trim(str) abort
+  return matchstr(a:str,'^\s*\zs.\{-}\ze\s*$')
+endfunction
+
+function! Test_match_using_multibyte_conceal_char()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#ˑThisˑisˑaˑTest'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 20, -1, {'conceal': "\u02d1"})
+  redraw!
+
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  quit!
+endfunction

src/nvim/version.c

@@ -703,7 +703,7 @@ static int included_patches[] = {
   // 1743 NA
   // 1742,
   // 1741,
-  // 1740,
+  1740,
   // 1739,
   // 1738,
   // 1737 NA

test/functional/legacy/match_conceal_spec.lua

@@ -1,228 +0,0 @@
--- Test for matchadd() and conceal feature
-
-local helpers = require('test.functional.helpers')(after_each)
-local clear = helpers.clear
-local expect = helpers.expect
-local source = helpers.source
-
-describe('match_conceal', function()
-  before_each(function()
-    clear()
-
-    source([[
-      set wildchar=^E
-      10new
-      vsp
-      vert resize 20
-      put =\"\#\ This\ is\ a\ Test\"
-      norm! mazt
-      
-      fu! ScreenChar(width, lines)
-        let c=''
-        for j in range(1,a:lines)
-          for i in range(1,a:width)
-            let c.=nr2char(screenchar(j, i))
-          endfor
-          let c.="\n"
-        endfor
-        return c
-      endfu
-      
-      fu! ScreenAttr(line, pos, eval)
-        let g:attr=[]
-        for col in a:pos
-          call add(g:attr, screenattr(a:line,col))
-        endfor
-        " In case all values are zero, probably the terminal
-        " isn't set correctly, so catch that case
-        let null = (eval(join(g:attr, '+')) == 0)
-        let str=substitute(a:eval, '\d\+', 'g:attr[&]', 'g')
-        if null || eval(str)
-          let g:attr_test="OK: ". str
-        else
-          let g:attr_test="FAILED: ".str
-          let g:attr_test.="\n". join(g:attr, ' ')
-          let g:attr_test.="\n TERM: ". &term
-        endif
-      endfu
-      
-      fu! DoRecordScreen()
-        wincmd l
-        $put =printf(\"\n%s\", g:test)
-        $put =g:line
-        $put =g:attr_test
-        wincmd p
-      endfu
-    ]])
-  end)
-
-  it('is working', function()
-    source([=[
-      let g:test ="Test 1: simple addmatch()"
-      call matchadd('Conceal', '\%2l ')
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-
-      let g:test ="Test 2: simple addmatch() and conceal (should be: #XThisXisXaXTest)"
-      norm! 'azt
-      call clearmatches()
-      syntax on
-      set concealcursor=n conceallevel=1
-      call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'X'})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-
-      let g:test ="Test 3: addmatch() and conceallevel=3 (should be: #ThisisaTest)"
-      norm! 'azt
-      set conceallevel=3
-      call clearmatches()
-      call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'X'})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0==1 && 1==2 && 1==3 && 1==4 && 0!=5")
-      call DoRecordScreen()
-
-      let g:test ="Test 4: more match() (should be: #Thisisa Test)"
-      norm! 'azt
-      call matchadd('ErrorMsg', '\%2l Test', 20, -1, {'conceal': 'X'})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0==1 && 1==2 && 0!=3 && 3==4 && 0!=5 && 3!=5")
-      call DoRecordScreen()
-
-      let g:test ="Test 5/1: default conceal char (should be: # This is a Test)"
-      norm! 'azt
-      call clearmatches()
-      set conceallevel=1
-      call matchadd('Conceal', '\%2l ', 10, -1, {})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-      let g:test ="Test 5/2: default conceal char (should be: #+This+is+a+Test)"
-      norm! 'azt
-      set listchars=conceal:+
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-      set listchars&vi
-
-      let g:test ="Test 6/1: syn and match conceal (should be: #ZThisZisZaZTest)"
-      norm! 'azt
-      call clearmatches()
-      set conceallevel=1
-      call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'Z'})
-      syn match MyConceal /\%2l / conceal containedin=ALL cchar=*
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-      let g:test ="Test 6/2: syn and match conceal (should be: #*This*is*a*Test)"
-      norm! 'azt
-      call clearmatches()
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-
-      let g:test ="Test 7/1: clear matches"
-      norm! 'azt
-      syn on
-      call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'Z'})
-      let a=getmatches()
-      call clearmatches()
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0==1 && 0==2 && 0==3 && 0==4 && 0==5")
-      call DoRecordScreen()
-      $put =a
-      call setmatches(a)
-      norm! 'azt
-      let g:test ="Test 7/2: reset match using setmatches()"
-      norm! 'azt
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-
-      let g:test ="Test 8: using matchaddpos() (should be #Pis a Test"
-      norm! 'azt
-      call clearmatches()
-      call matchaddpos('Conceal', [[2,2,6]], 10, -1, {'conceal': 'P'})
-      let a=getmatches()
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1!=2 && 0==2 && 0==3 && 0!=4 && 0!=5 && 4==5")
-      call DoRecordScreen()
-      $put =a
-
-      let g:test ="Test 9: match using multibyte conceal char (should be: #ˑThisˑisˑaˑTest)"
-      norm! 'azt
-      call clearmatches()
-      call matchadd('Conceal', '\%2l ', 20, -1, {'conceal': "\u02d1"})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-    ]=])
-
-    expect([=[
-      
-      # This is a Test
-      
-      Test 1: simple addmatch()
-      # This is a Test    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 2: simple addmatch() and conceal (should be: #XThisXisXaXTest)
-      #XThisXisXaXTest    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 3: addmatch() and conceallevel=3 (should be: #ThisisaTest)
-      #ThisisaTest        
-      OK: g:attr[0]==g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]!=g:attr[5]
-      
-      Test 4: more match() (should be: #Thisisa Test)
-      #Thisisa Test       
-      OK: g:attr[0]==g:attr[1] && g:attr[1]==g:attr[2] && g:attr[0]!=g:attr[3] && g:attr[3]==g:attr[4] && g:attr[0]!=g:attr[5] && g:attr[3]!=g:attr[5]
-      
-      Test 5/1: default conceal char (should be: # This is a Test)
-      # This is a Test    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 5/2: default conceal char (should be: #+This+is+a+Test)
-      #+This+is+a+Test    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 6/1: syn and match conceal (should be: #ZThisZisZaZTest)
-      #ZThisZisZaZTest    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 6/2: syn and match conceal (should be: #*This*is*a*Test)
-      #*This*is*a*Test    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 7/1: clear matches
-      # This is a Test    
-      OK: g:attr[0]==g:attr[1] && g:attr[0]==g:attr[2] && g:attr[0]==g:attr[3] && g:attr[0]==g:attr[4] && g:attr[0]==g:attr[5]
-      {'group': 'Conceal', 'pattern': '\%2l ', 'priority': 10, 'id': 10, 'conceal': 'Z'}
-      
-      Test 7/2: reset match using setmatches()
-      #ZThisZisZaZTest    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 8: using matchaddpos() (should be #Pis a Test
-      #Pis a Test         
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]!=g:attr[2] && g:attr[0]==g:attr[2] && g:attr[0]==g:attr[3] && g:attr[0]!=g:attr[4] && g:attr[0]!=g:attr[5] && g:attr[4]==g:attr[5]
-      {'group': 'Conceal', 'id': 11, 'priority': 10, 'pos1': [2, 2, 6], 'conceal': 'P'}
-      
-      Test 9: match using multibyte conceal char (should be: #ˑThisˑisˑaˑTest)
-      #ˑThisˑisˑaˑTest    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]]=])
-  end)
-end)

test/functional/legacy/undolevels_spec.lua

@@ -10,7 +10,7 @@ describe('undolevel', function()
       func FillBuffer()
         for i in range(1,13)
           put=i
-          " Set 'undolevels' to split undo. 
+          " Set 'undolevels' to split undo.
           exe "setg ul=" . &g:ul
         endfor
       endfunc
@@ -48,6 +48,10 @@ describe('undolevel', function()
         call assert_equal(50, &g:undolevels)
         call assert_equal(-123456, &l:undolevels)
 
+        " Drop created windows
+        set ul&
+        new
+        only!
       endfunc
 
       call Test_global_local_undolevels()