To: vim_dev@googlegroups.com Subject: Patch 9.0.0488 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0488 Problem: Cursor in wrong position with virtual text "above" and 'showbreak'. Solution: Take the first character column into account. (closes #11149) Files: src/charset.c, src/testdir/test_textprop.vim, src/testdir/dumps/Test_prop_with_text_above_1c.dump *** ../vim-9.0.0487/src/charset.c 2022-09-14 16:09:53.344308323 +0100 --- src/charset.c 2022-09-17 17:13:57.375802045 +0100 *************** *** 1280,1285 **** --- 1280,1288 ---- numberextra = numberwidth; vcol += numberextra + mb_added; + #ifdef FEAT_PROP_POPUP + vcol -= wp->w_virtcol_first_char; + #endif if (vcol >= (colnr_T)wp->w_width) { vcol -= wp->w_width; *** ../vim-9.0.0487/src/testdir/test_textprop.vim 2022-09-16 20:50:44.968907925 +0100 --- src/testdir/test_textprop.vim 2022-09-17 17:12:02.144065000 +0100 *************** *** 2874,2879 **** --- 2874,2884 ---- call term_sendkeys(buf, "g0") call VerifyScreenDump(buf, 'Test_prop_with_text_above_1b', {}) + call term_sendkeys(buf, ":set showbreak=>>\") + call term_sendkeys(buf, "ggll") + call VerifyScreenDump(buf, 'Test_prop_with_text_above_1c', {}) + call term_sendkeys(buf, ":set showbreak=\") + call term_sendkeys(buf, "ggI") call VerifyScreenDump(buf, 'Test_prop_with_text_above_2', {}) call term_sendkeys(buf, "inserted \") *** ../vim-9.0.0487/src/testdir/dumps/Test_prop_with_text_above_1c.dump 2022-09-17 17:14:46.675689898 +0100 --- src/testdir/dumps/Test_prop_with_text_above_1c.dump 2022-09-17 17:12:30.112001063 +0100 *************** *** 0 **** --- 1,9 ---- + |f+0&#ffff4012|i|r|s|t| |t|h|i|n|g| |a|b|o|v|e| @42 + |s+0&#ffd7ff255|e|c|o|n|d| |t|h|i|n|g| |a|b|o|v|e| @41 + |o+0&#ffffff0|n>e| |t|w|o| @52 + |t|h|r|e@1| |f|o|u|r| @49 + @3|a+0&#ffff4012|n|o|t|h|e|r| |t|h|i|n|g| @43 + |f+0&#ffffff0|i|v|e| |s|i|x| @51 + |~+0#4040ff13&| @58 + |~| @58 + |:+0#0000000&|s|e|t| |s|h|o|w|b|r|e|a|k|=|>@1| @24|1|,|3|-|1|2|3| @6|A|l@1| *** ../vim-9.0.0487/src/version.c 2022-09-17 16:27:36.142603905 +0100 --- src/version.c 2022-09-17 17:06:37.264814386 +0100 *************** *** 705,706 **** --- 705,708 ---- { /* Add new patch number below this line */ + /**/ + 488, /**/ -- % cat /usr/include/long_life.h long life(double fun); /// 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 ///