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

Patch 8.2.3535
Problem:    If-else indenting is confusing.
Solution:   Add curly brackets and indent. (Dominique Pellé, closes #9010)
Files:      src/drawscreen.c


*** ../vim-8.2.3534/src/drawscreen.c	2021-10-08 18:39:23.595208057 +0100
--- src/drawscreen.c	2021-10-18 20:52:15.871708147 +0100
***************
*** 2305,2317 ****
  			    ++new_rows;
  			else
  #endif
  #ifdef FEAT_DIFF
  			    if (l == wp->w_topline)
! 			    new_rows += plines_win_nofill(wp, l, TRUE)
  							      + wp->w_topfill;
! 			else
  #endif
! 			    new_rows += plines_win(wp, l, TRUE);
  			++j;
  			if (new_rows > wp->w_height - row - 2)
  			{
--- 2305,2319 ----
  			    ++new_rows;
  			else
  #endif
+ 			{
  #ifdef FEAT_DIFF
  			    if (l == wp->w_topline)
! 				new_rows += plines_win_nofill(wp, l, TRUE)
  							      + wp->w_topfill;
! 			    else
  #endif
! 				new_rows += plines_win(wp, l, TRUE);
! 			}
  			++j;
  			if (new_rows > wp->w_height - row - 2)
  			{
*** ../vim-8.2.3534/src/version.c	2021-10-18 14:37:09.674150954 +0100
--- src/version.c	2021-10-18 20:56:23.513479895 +0100
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     3535,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
193. You ask your girlfriend to drive home so you can sit back with
     your PDA and download the information to your laptop

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