Patch 9.0.0679

[Bram Moolenaar]

Patch 9.0.0679
Problem: Tests failing with 'smoothscroll', 'number' and "n" in 'cpo'.
Solution: Do not count number column in topline if columns are skipped.
Files: src/drawline.c


*** ../vim-9.0.0678/src/drawline.c 2022-10-06 19:21:16.514531351 +0100
--- src/drawline.c 2022-10-06 20:14:27.393198501 +0100
***************
*** 342,350 ****
int sign_present UNUSED,
int num_attr UNUSED)
{
if ((wp->w_p_nu || wp->w_p_rnu)
! && (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
--- 342,352 ----
int sign_present UNUSED,
int num_attr UNUSED)
{
+ int has_cpo_n = vim_strchr(p_cpo, CPO_NUMCOL) != NULL;
+
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
*** ../vim-9.0.0678/src/version.c 2022-10-06 19:49:09.565466187 +0100
--- src/version.c 2022-10-06 20:16:01.656950802 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 679,
/**/

--
GALAHAD hurries to the door and pushes through it. As he leaves the room
we CUT TO the reverse to show that he is now in a room full of bathing
and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile
enchantingly at him as he tries to keep walking without being diverted by
the lovely sights assaulting his eyeballs.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@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 ///