Mercurial > vim

diff src/drawline.c @ 19174:d5b793803236 v8.2.0146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0146: wrong indent when 'showbreak' and 'breakindent' are set Commit: https://github.com/vim/vim/commit/dfede9a70b3136988a8f262742101ad5cb98f46d Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 23 19:59:22 2020 +0100 patch 8.2.0146: wrong indent when 'showbreak' and 'breakindent' are set Problem: Wrong indent when 'showbreak' and 'breakindent' are set and 'briopt' includes "sbr". Solution: Reset "need_showbreak" where needed. (Ken Takata, closes #5523)
author Bram Moolenaar <Bram@vim.org>
date Thu, 23 Jan 2020 20:00:04 +0100
parents 79b689ff168d
children ce8c47ed54e5
line wrap: on
line diff
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1176,6 +1176,8 @@ win_line(
 		    c_final = NUL;
 		    n_extra = get_breakindent_win(wp,
 				       ml_get_buf(wp->w_buffer, lnum, FALSE));
+		    if (wp->w_skipcol > 0 && wp->w_p_wrap)
+			need_showbreak = FALSE;
 		    // Correct end of highlighted area for 'breakindent',
 		    // required when 'linebreak' is also set.
 		    if (tocol == vcol)
@@ -1222,7 +1224,8 @@ win_line(
 		    c_extra = NUL;
 		    c_final = NUL;
 		    n_extra = (int)STRLEN(sbr);
-		    need_showbreak = FALSE;
+		    if (wp->w_skipcol == 0 || !wp->w_p_wrap)
+			need_showbreak = FALSE;
 		    vcol_sbr = vcol + MB_CHARLEN(sbr);
 		    // Correct end of highlighted area for 'showbreak',
 		    // required when 'linebreak' is also set.