To: vim_dev@googlegroups.com Subject: Patch 9.0.0681 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0681 Problem: "<<<" shows for 'smoothscroll' even when 'showbreak is set. Solution: When 'showbreak' is set do not display "<<<". Files: src/drawline.c, src/testdir/test_breakindent.vim, src/testdir/test_listlbr_utf8.vim *** ../vim-9.0.0680/src/drawline.c 2022-10-06 20:47:57.352649829 +0100 --- src/drawline.c 2022-10-06 20:44:06.388563865 +0100 *************** *** 745,756 **** /* * Call screen_line() using values from "wlv". ! * Also takes care of putting "<<<" on the first line for 'smoothscroll'. */ static void wlv_screen_line(win_T *wp, winlinevars_T *wlv, int negative_width) { ! if (wlv->row == 0 && wp->w_skipcol > 0) { int off = (int)(current_ScreenLine - ScreenLines); --- 745,761 ---- /* * Call screen_line() using values from "wlv". ! * Also takes care of putting "<<<" on the first line for 'smoothscroll' ! * when 'showbreak' is not set. */ static void wlv_screen_line(win_T *wp, winlinevars_T *wlv, int negative_width) { ! if (wlv->row == 0 && wp->w_skipcol > 0 ! #if defined(FEAT_LINEBREAK) ! && *get_showbreak_value(wp) == NUL ! #endif ! ) { int off = (int)(current_ScreenLine - ScreenLines); *** ../vim-9.0.0680/src/testdir/test_breakindent.vim 2022-10-06 19:21:16.514531351 +0100 --- src/testdir/test_breakindent.vim 2022-10-06 19:40:18.539473920 +0100 *************** *** 660,666 **** norm! 5gj let lines = s:screen_lines(1, 20) let expect = [ ! \ "<<aaaaaaaaaaaaaaaaaaa", \ ">aaaaaaaaaaaaaaaaaaa", \ ] --- 660,666 ---- norm! 5gj let lines = s:screen_lines(1, 20) let expect = [ ! \ ">aaaaaaaaaaaaaaaaaaa", \ ">aaaaaaaaaaaaaaaaaaa", \ ">aaaaaaaaaaaaaaaaaaa", \ ] *** ../vim-9.0.0680/src/testdir/test_listlbr_utf8.vim 2022-10-03 17:07:29.997542931 +0100 --- src/testdir/test_listlbr_utf8.vim 2022-10-06 20:00:29.107448563 +0100 *************** *** 167,173 **** exe "norm! $3B\eAx\" let lines = s:screen_lines([1, 10], winwidth(0)) let expect = [ ! \ "<<eAx\" let lines = s:screen_lines([1, 10], winwidth(0)) let expect = [ ! \ "+foobar foobar ", \ "+foobar foobar ", \ "+foobar foobar ", \ "+foobar foobar ", *** ../vim-9.0.0680/src/version.c 2022-10-06 20:47:57.352649829 +0100 --- src/version.c 2022-10-06 21:19:34.351099099 +0100 *************** *** 701,702 **** --- 701,704 ---- { /* Add new patch number below this line */ + /**/ + 681, /**/ -- ### Hiroshima 45, Chernobyl 86, Windows 95 ### /// 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 ///