Patch 8.2.1211 (after 8.2.1118
Problem:    Removed more than dead code.
Solution:   Put back the decrement.
Files:      src/move.c, src/testdir/test_diffmode.vim


*** ../vim-8.2.1210/src/move.c  2020-07-02 21:23:38.641427657 +0200
--- src/move.c  2020-07-14 21:21:44.831907919 +0200
***************
*** 2681,2686 ****
--- 2681,2687 ----
            if (curwin->w_topfill > 0)
            {
                i = 1;
+               --n;
                --curwin->w_topfill;
            }
            else
*** ../vim-8.2.1210/src/testdir/test_diffmode.vim       2020-06-25 
22:23:45.089461529 +0200
--- src/testdir/test_diffmode.vim       2020-07-14 21:21:13.239993439 +0200
***************
*** 1130,1133 ****
--- 1130,1153 ----
    redraw
  endfunc
  
+ func Test_diff_and_scroll()
+   " this was causing an ml_get error
+   set ls=2
+   for i in range(winheight(0) * 2) 
+     call setline(i, i < winheight(0) - 10 ? i : i + 10) 
+   endfor
+   vnew
+   for i in range(winheight(0)*2 + 10) 
+     call setline(i, i < winheight(0) - 10 ? 0 : i) 
+   endfor
+   diffthis
+   wincmd p
+   diffthis
+   execute 'normal ' . winheight(0) . "\<C-d>"
+ 
+   bwipe!
+   bwipe!
+   set ls&
+ endfunc
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.1210/src/version.c       2020-07-14 21:08:44.354001840 +0200
--- src/version.c       2020-07-14 21:18:29.796435211 +0200
***************
*** 756,757 ****
--- 756,759 ----
  {   /* Add new patch number below this line */
+ /**/
+     1211,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
5. Put decaf in the coffee maker for 3 weeks. Once everyone has gotten
   over their caffeine addictions, switch to espresso.

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/202007141922.06EJMvgA3128979%40masaka.moolenaar.net.

Raspunde prin e-mail lui