Mercurial > vim

changeset 26003:37852c2bf3d4 v8.2.3535

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3535: if-else indenting is confusing Commit: https://github.com/vim/vim/commit/9b0b844d252ea84b3607f39603b4afa8cb002418 Author: Dominique Pelle <dominique.pelle@gmail.com> Date: Mon Oct 18 20:56:39 2021 +0100 patch 8.2.3535: if-else indenting is confusing Problem: If-else indenting is confusing. Solution: Add curly brackets and indent. (Dominique Pell?, closes https://github.com/vim/vim/issues/9010)
author Bram Moolenaar <Bram@vim.org>
date Mon, 18 Oct 2021 22:00:06 +0200
parents c45e990847e5
children b206279f30c7
files src/drawscreen.c src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -2305,13 +2305,15 @@ win_update(win_T *wp)
 			    ++new_rows;
 			else
 #endif
+			{
 #ifdef FEAT_DIFF
 			    if (l == wp->w_topline)
-			    new_rows += plines_win_nofill(wp, l, TRUE)
+				new_rows += plines_win_nofill(wp, l, TRUE)
 							      + wp->w_topfill;
-			else
+			    else
 #endif
-			    new_rows += plines_win(wp, l, TRUE);
+				new_rows += plines_win(wp, l, TRUE);
+			}
 			++j;
 			if (new_rows > wp->w_height - row - 2)
 			{
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3535,
+/**/
     3534,
 /**/
     3533,