To: vim_dev@googlegroups.com Subject: Patch 8.1.2039 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2039 Problem: Character from 'showbreak' does not use 'wincolor'. (Nick Jensen) Solution: Mix with 'wincolor'. (closes #4938) Files: src/screen.c, src/testdir/test_popupwin.vim, src/testdir/dumps/Test_popupwin_showbreak.dump *** ../vim-8.1.2038/src/screen.c 2019-09-14 22:33:44.152114604 +0200 --- src/screen.c 2019-09-15 18:10:11.748279641 +0200 *************** *** 4153,4158 **** --- 4153,4161 ---- * required when 'linebreak' is also set. */ if (tocol == vcol) tocol += n_extra; + // combine 'showbreak' with 'wincolor' + if (win_attr != 0) + char_attr = hl_combine_attr(win_attr, char_attr); # ifdef FEAT_SYN_HL // combine 'showbreak' with 'cursorline' if (cul_attr != 0) *** ../vim-8.1.2038/src/testdir/test_popupwin.vim 2019-09-14 21:23:37.141281837 +0200 --- src/testdir/test_popupwin.vim 2019-09-15 18:08:04.648706544 +0200 *************** *** 797,804 **** set showbreak=>>\ call setline(1, range(1, 20)) let winid = popup_dialog( ! \ 'a long line here', ! \ #{filter: 'popup_filter_yesno'}) END call writefile(lines, 'XtestPopupShowbreak') let buf = RunVimInTerminal('-S XtestPopupShowbreak', #{rows: 10}) --- 797,805 ---- set showbreak=>>\ call setline(1, range(1, 20)) let winid = popup_dialog( ! \ 'a long line here that wraps', ! \ #{filter: 'popup_filter_yesno', ! \ maxwidth: 12}) END call writefile(lines, 'XtestPopupShowbreak') let buf = RunVimInTerminal('-S XtestPopupShowbreak', #{rows: 10}) *** ../vim-8.1.2038/src/testdir/dumps/Test_popupwin_showbreak.dump 2019-07-20 17:45:45.552285965 +0200 --- src/testdir/dumps/Test_popupwin_showbreak.dump 2019-09-15 18:08:14.892672150 +0200 *************** *** 1,10 **** >1+0&#ffffff0| @73 |2| @73 ! |3| @73 ! |4| @25|╔+0#0000001#ffd7ff255|═@17|╗| +0#0000000#ffffff0@27 ! |5| @25|║+0#0000001#ffd7ff255| |a| |l|o|n|g| |l|i|n|e| |h|e|r|e| |║| +0#0000000#ffffff0@27 ! |6| @25|╚+0#0000001#ffd7ff255|═@17|╝| +0#0000000#ffffff0@27 ! |7| @73 |8| @73 |9| @73 @57|1|,|1| @10|T|o|p| --- 1,10 ---- >1+0&#ffffff0| @73 |2| @73 ! |3| @27|╔+0#0000001#ffd7ff255|═@13|╗| +0#0000000#ffffff0@29 ! |4| @27|║+0#0000001#ffd7ff255| |a| |l|o|n|g| |l|i|n|e| @1|║| +0#0000000#ffffff0@29 ! |5| @27|║+0#0000001#ffd7ff255| |>+0#4040ff13&@1| |h+0#0000001&|e|r|e| |t|h|a|t| |║| +0#0000000#ffffff0@29 ! |6| @27|║+0#0000001#ffd7ff255| |>+0#4040ff13&@1| | +0#0000001&|w|r|a|p|s| @3|║| +0#0000000#ffffff0@29 ! |7| @27|╚+0#0000001#ffd7ff255|═@13|╝| +0#0000000#ffffff0@29 |8| @73 |9| @73 @57|1|,|1| @10|T|o|p| *** ../vim-8.1.2038/src/version.c 2019-09-15 17:49:06.516490668 +0200 --- src/version.c 2019-09-15 18:09:19.292455880 +0200 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 2039, /**/ -- hundred-and-one symptoms of being an internet addict: 268. You get up in the morning and go online before getting your coffee. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///