# HG changeset patch # User Bram Moolenaar # Date 1634587206 -7200 # Node ID 37852c2bf3d4cd454de07ee1306cad3397896e34 # Parent c45e990847e56c5db9ec29958000e2b7b62c42f5 patch 8.2.3535: if-else indenting is confusing Commit: https://github.com/vim/vim/commit/9b0b844d252ea84b3607f39603b4afa8cb002418 Author: Dominique Pelle 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) diff --git a/src/drawscreen.c b/src/drawscreen.c --- 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) { diff --git a/src/version.c b/src/version.c --- 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,