To: vim_dev@googlegroups.com
Subject: Patch 9.0.1667
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.1667
Problem:    Regression test doesn't fail when fix is reverted.
Solution:   Add "n" to 'cpoptions' instead of using :winsize. (closes #12587,
            issue #12528)
Files:      src/testdir/test_scroll_opt.vim,
            src/testdir/dumps/Test_smoothscroll_zero_bot.dump


*** ../vim-9.0.1666/src/testdir/test_scroll_opt.vim	2023-06-24 21:57:47.743177847 +0100
--- src/testdir/test_scroll_opt.vim	2023-06-26 18:59:51.771458235 +0100
***************
*** 840,846 ****
    let lines =<< trim END
        silent normal yy
        silent normal 19p
!       winsize 0 19
        vsplit
        vertical resize 0
        set foldcolumn=1
--- 840,846 ----
    let lines =<< trim END
        silent normal yy
        silent normal 19p
!       set cpoptions+=n
        vsplit
        vertical resize 0
        set foldcolumn=1
***************
*** 849,857 ****
        silent normal 20G
    END
    call writefile(lines, 'XSmoothScrollZeroBot', 'D')
!   let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19, wait_for_ruler: 0})
!   call TermWait(buf, 1000)
! 
    call VerifyScreenDump(buf, 'Test_smoothscroll_zero_bot', {})
  
    call StopVimInTerminal(buf)
--- 849,855 ----
        silent normal 20G
    END
    call writefile(lines, 'XSmoothScrollZeroBot', 'D')
!   let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19})
    call VerifyScreenDump(buf, 'Test_smoothscroll_zero_bot', {})
  
    call StopVimInTerminal(buf)
*** ../vim-9.0.1666/src/testdir/dumps/Test_smoothscroll_zero_bot.dump	2023-06-24 21:57:47.743177847 +0100
--- src/testdir/dumps/Test_smoothscroll_zero_bot.dump	2023-06-26 18:59:51.771458235 +0100
***************
*** 1,19 ****
! | +0#af5f00255#ffffff0||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! |@+0#4040ff13&||+1#0000000&| +0&&@9
! >@+0#4040ff13&||+1#0000000&| +0&&@9
! |<+3&&| |<+1&&|a|m|e|]| |[|+|]| 
! | +0&&@11
--- 1,19 ----
! | +0#af5f00255#ffffff0||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! |@+0#4040ff13&||+1#0000000&| +0&&@72
! >@+0#4040ff13&||+1#0000000&| +0&&@72
! |<+3&&| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @59
! | +0&&@74
*** ../vim-9.0.1666/src/version.c	2023-06-26 18:48:05.343295466 +0100
--- src/version.c	2023-06-26 19:01:51.343741259 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1667,
  /**/

-- 
A man is incomplete until he's married ... and then he's finished!

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