To: vim_dev@googlegroups.com Subject: Patch 9.0.0162 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0162 Problem: Text property "below" gets indent if 'breakindent' is set. (Tim Pope) Solution: Do not put indent before text property. (closes #10859) Files: src/drawline.c, src/testdir/test_textprop.vim, src/testdir/dumps/Test_prop_with_text_after_1.dump *** ../vim-9.0.0161/src/drawline.c 2022-08-06 22:37:58.760550815 +0100 --- src/drawline.c 2022-08-07 11:52:42.343489266 +0100 *************** *** 1408,1413 **** --- 1408,1416 ---- # ifdef FEAT_DIFF && filler_lines == 0 # endif + # ifdef FEAT_PROP_POPUP + && !dont_use_showbreak + # endif ) { wlv.char_attr = 0; *** ../vim-9.0.0161/src/testdir/test_textprop.vim 2022-08-06 22:02:58.187795341 +0100 --- src/testdir/test_textprop.vim 2022-08-07 11:49:44.239747697 +0100 *************** *** 2312,2318 **** let lines =<< trim END set showbreak=+++ ! call setline(1, 'some text here and other text there') call prop_type_add('rightprop', #{highlight: 'ErrorMsg'}) call prop_type_add('afterprop', #{highlight: 'Search'}) call prop_type_add('belowprop', #{highlight: 'DiffAdd'}) --- 2312,2319 ---- let lines =<< trim END set showbreak=+++ ! set breakindent ! call setline(1, ' some text here and other text there') call prop_type_add('rightprop', #{highlight: 'ErrorMsg'}) call prop_type_add('afterprop', #{highlight: 'Search'}) call prop_type_add('belowprop', #{highlight: 'DiffAdd'}) *** ../vim-9.0.0161/src/testdir/dumps/Test_prop_with_text_after_1.dump 2022-08-05 20:25:46.670888624 +0100 --- src/testdir/dumps/Test_prop_with_text_after_1.dump 2022-08-07 11:51:26.867598514 +0100 *************** *** 1,4 **** ! |s+0&#ffffff0|o|m|e| |t|e|x|t| |h|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |t|h|e|r|e| +0&#ffff4012|A|F|T|E|R| | +0&#ffffff0@10| +0#ffffff16#e000002|R|I|G|H|T| | +0#0000000#5fd7ff255|B|E|L|O|W| | +0&#ffffff0@52 | +0fd7ff255|A|L|S|O| |B|E|L|O|W| | +0&#ffffff0@47 |L|a|s|t| |l|i|n|e>.| +0&#ffff4012|A|f|t|e|r| |L|a|s|t| | +0&#ffffff0@37 --- 1,4 ---- ! | +0&#ffffff0@2|s|o|m|e| |t|e|x|t| |h|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |t|h|e|r|e| +0&#ffff4012|A|F|T|E|R| | +0&#ffffff0@7| +0#ffffff16#e000002|R|I|G|H|T| | +0#0000000#5fd7ff255|B|E|L|O|W| | +0&#ffffff0@52 | +0fd7ff255|A|L|S|O| |B|E|L|O|W| | +0&#ffffff0@47 |L|a|s|t| |l|i|n|e>.| +0&#ffff4012|A|f|t|e|r| |L|a|s|t| | +0&#ffffff0@37 *** ../vim-9.0.0161/src/version.c 2022-08-06 22:37:58.760550815 +0100 --- src/version.c 2022-08-07 11:51:10.639622051 +0100 *************** *** 737,738 **** --- 737,740 ---- { /* Add new patch number below this line */ + /**/ + 162, /**/ -- XML is a nice language for computers. Not for humans. /// 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 ///