To: vim_dev@googlegroups.com
Subject: Patch 9.0.1502
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.1502
Problem:    No test for deleting the end of a long wrapped line.
Solution:   Add a test to check the right text is displayed. (Luuk van Baal,
            closes #12318)
Files:      src/testdir/test_display.vim,
            src/testdir/dumps/Test_display_long_line_1.dump,
            src/testdir/dumps/Test_display_long_line_2.dump


*** ../vim-9.0.1501/src/testdir/test_display.vim	2022-11-28 22:20:07.186252879 +0000
--- src/testdir/test_display.vim	2023-04-30 19:14:49.113474051 +0100
***************
*** 467,471 ****
--- 467,492 ----
    call assert_fails(':set fillchars=lastline:〇', 'E474:')
  endfunc
  
+ func Test_display_long_lastline()
+   CheckScreendump
+ 
+   let lines =<< trim END
+     set display=lastline
+     call setline(1, [
+       \'aaaaa'->repeat(100),
+       \'bbbbb '->repeat(7) .. 'ccccc '->repeat(7) .. 'ddddd '->repeat(7)
+     \])
+   END
+ 
+   call writefile(lines, 'XdispLongline', 'D')
+   let buf = RunVimInTerminal('-S XdispLongline', #{rows: 14, cols: 35})
+ 
+   call term_sendkeys(buf, "482|")
+   call VerifyScreenDump(buf, 'Test_display_long_line_1', {})
+   call term_sendkeys(buf, "D")
+   call VerifyScreenDump(buf, 'Test_display_long_line_2', {})
+ 
+   call StopVimInTerminal(buf)
+ endfunc
  
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-9.0.1501/src/testdir/dumps/Test_display_long_line_1.dump	2023-04-30 19:14:00.305601401 +0100
--- src/testdir/dumps/Test_display_long_line_1.dump	2023-04-30 19:09:03.274635626 +0100
***************
*** 0 ****
--- 1,14 ----
+ |<+0#4040ff13#ffffff0@2|a+0#0000000&@31
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @26>a@8
+ @10| @24
+ @18|1|,|4|8|2| @7|T|o|p| 
*** ../vim-9.0.1501/src/testdir/dumps/Test_display_long_line_2.dump	2023-04-30 19:14:00.309601391 +0100
--- src/testdir/dumps/Test_display_long_line_2.dump	2023-04-30 19:09:03.274635626 +0100
***************
*** 0 ****
--- 1,14 ----
+ |<+0#4040ff13#ffffff0@2|a+0#0000000&@31
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @35
+ @25>a| @8
+ |b@4| |b@4| |b@4| |b@4| |b@4| |b@1|@+0#4040ff13&@2
+ | +0#0000000&@17|1|,|4|8|1| @7|T|o|p| 
*** ../vim-9.0.1501/src/version.c	2023-04-30 18:50:44.571465836 +0100
--- src/version.c	2023-04-30 19:11:33.814048654 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1502,
  /**/

-- 
   A village.  Sound of chanting of Latin canon, punctuated by short, sharp
   cracks.  It comes nearer.  We see it is a line of MONKS ala SEVENTH SEAL
   flagellation scene, chanting and banging themselves on the foreheads with
   wooden boards.
                 "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    ///