To: vim_dev@googlegroups.com
Subject: Patch 9.0.0680
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0680
Problem:    Tests failing with 'breakindent', 'number' and "n" in 'cpo'.
Solution:   Do count the number column in topline if 'breakindent' is set.
Files:      src/drawline.c


*** ../vim-9.0.0679/src/drawline.c	2022-10-06 20:18:11.676609993 +0100
--- src/drawline.c	2022-10-06 20:44:06.388563865 +0100
***************
*** 346,352 ****
  
      if ((wp->w_p_nu || wp->w_p_rnu)
  	     && (wlv->row == wlv->startrow + wlv->filler_lines || !has_cpo_n)
! 	     && !(has_cpo_n && wp->w_skipcol > 0 && wlv->lnum == wp->w_topline))
      {
  #ifdef FEAT_SIGNS
  	// If 'signcolumn' is set to 'number' and a sign is present
--- 346,358 ----
  
      if ((wp->w_p_nu || wp->w_p_rnu)
  	     && (wlv->row == wlv->startrow + wlv->filler_lines || !has_cpo_n)
! 	     // there is no line number in a wrapped line when "n" is in
! 	     // 'cpoptions', but 'breakindent' assumes it anyway.
! 	     && !((has_cpo_n
! #ifdef FEAT_LINEBREAK
! 		     && !wp->w_p_bri
! #endif
! 		  ) && wp->w_skipcol > 0 && wlv->lnum == wp->w_topline))
      {
  #ifdef FEAT_SIGNS
  	// If 'signcolumn' is set to 'number' and a sign is present
*** ../vim-9.0.0679/src/version.c	2022-10-06 20:18:11.676609993 +0100
--- src/version.c	2022-10-06 20:46:29.056442603 +0100
***************
*** 701,702 ****
--- 701,704 ----
  {   /* Add new patch number below this line */
+ /**/
+     680,
  /**/

-- 
DINGO: Wicked wicked Zoot ... she is a bad person and she must pay the
       penalty.  And here in Castle Anthrax, we have but one punishment
       ... you must tie her down on a bed ... and spank her.  Come!
GIRLS: A spanking!  A spanking!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// 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    ///