To: vim_dev@googlegroups.com Subject: Patch 8.2.3706 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3706 (after 8.2.3700) Problem: Text property highlighting is used on Tab. Solution: Only set in_linebreak when not on a Tab. (closes #9242) Files: src/drawline.c, src/testdir/test_textprop.vim, src/testdir/dumps/Test_prop_after_tab.dump *** ../vim-8.2.3705/src/drawline.c 2021-11-29 21:12:20.868101794 +0000 --- src/drawline.c 2021-11-30 20:20:20.369098196 +0000 *************** *** 2046,2052 **** c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; c_final = NUL; ! if (n_extra > 0) in_linebreak = TRUE; if (VIM_ISWHITE(c)) { --- 2046,2052 ---- c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; c_final = NUL; ! if (n_extra > 0 && c != TAB) in_linebreak = TRUE; if (VIM_ISWHITE(c)) { *** ../vim-8.2.3705/src/testdir/test_textprop.vim 2021-11-29 21:12:20.868101794 +0000 --- src/testdir/test_textprop.vim 2021-11-30 20:18:37.761178424 +0000 *************** *** 1633,1638 **** --- 1633,1656 ---- call delete('XscriptPropLinebreak') endfunc + func Test_prop_after_tab() + CheckRunVimInTerminal + + let lines =<< trim END + set breakindent linebreak breakat+=] + call setline(1, "\t[xxx]") + call prop_type_add('test', #{highlight: 'ErrorMsg'}) + call prop_add(1, 2, #{length: 1, type: 'test'}) + END + call writefile(lines, 'XscriptPropAfterTab') + let buf = RunVimInTerminal('-S XscriptPropAfterTab', #{rows: 10}) + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_prop_after_tab', {}) + + call StopVimInTerminal(buf) + call delete('XscriptPropAfterTab') + endfunc + " Buffer number of 0 should be ignored, as if the parameter wasn't passed. def Test_prop_bufnr_zero() new *** ../vim-8.2.3705/src/testdir/dumps/Test_prop_after_tab.dump 2021-11-30 20:20:46.385077258 +0000 --- src/testdir/dumps/Test_prop_after_tab.dump 2021-11-30 20:19:09.165154329 +0000 *************** *** 0 **** --- 1,10 ---- + | +0&#ffffff0@6> |[+0#ffffff16#e000002|x+0#0000000#ffffff0@2|]| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + | +0#0000000&@56|1|,|1|-|8| @8|A|l@1| *** ../vim-8.2.3705/src/version.c 2021-11-30 18:25:04.988458287 +0000 --- src/version.c 2021-11-30 20:20:55.161070132 +0000 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 3706, /**/ -- "Lisp has all the visual appeal of oatmeal with nail clippings thrown in." -- Larry Wall /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///