Mercurial > vim

diff src/drawline.c @ 30685:0e58aae55486 v9.0.0677

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0677: breakindent test accepts wrong result Commit: https://github.com/vim/vim/commit/06618f94f1c9ed73a84ad5d6a8e1933b0b8da846 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 6 19:21:20 2022 +0100 patch 9.0.0677: breakindent test accepts wrong result Problem: Breakindent test accepts wrong result. Solution: Fix the number column and adjust the expected text.
author Bram Moolenaar <Bram@vim.org>
date Thu, 06 Oct 2022 20:30:04 +0200
parents 0fbf3e042602
children ac8467091916
line wrap: on
line diff
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -343,9 +343,8 @@ handle_lnum_col(
 	int		num_attr UNUSED)
 {
     if ((wp->w_p_nu || wp->w_p_rnu)
-	    && ((wlv->row == wlv->startrow + wlv->filler_lines
-		    && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow))
-		|| vim_strchr(p_cpo, CPO_NUMCOL) == NULL))
+	     && (wlv->row == wlv->startrow + wlv->filler_lines
+			 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL))
     {
 #ifdef FEAT_SIGNS
 	// If 'signcolumn' is set to 'number' and a sign is present
@@ -363,7 +362,7 @@ handle_lnum_col(
 #ifdef FEAT_PROP_POPUP
 		  + wlv->text_prop_above_count
 #endif
-		  )
+		    && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow))
 	  {
 	      long num;
 	      char *fmt = "%*ld ";