# HG changeset patch # User Bram Moolenaar # Date 1641473103 -3600 # Node ID 1435891c3fd1e421b0250196c3f5c3cd74ffbe12 # Parent ae1e69d77cea98cd3b276f94fb481e08319e8de1 patch 8.2.4017: gcc warns for misleading indent in Athena menu code Commit: https://github.com/vim/vim/commit/a33737b6d80f5461c1c6c4c96b5bc4964a737927 Author: Dominique Pelle Date: Thu Jan 6 12:35:31 2022 +0000 patch 8.2.4017: gcc warns for misleading indent in Athena menu code Problem: Gcc warns for misleading indent in Athena menu code. Solution: Add curlies around the two statements. (Dominique Pell?, closes #9480) diff --git a/src/gui_athena.c b/src/gui_athena.c --- a/src/gui_athena.c +++ b/src/gui_athena.c @@ -1159,7 +1159,9 @@ gui_mch_add_menu_item(vimmenu_T *menu, i XtSetArg(args[n], XtNinternalWidth, 1); n++; XtSetArg(args[n], XtNborderWidth, 1); n++; if (menu->image != 0) + { XtSetArg(args[n], XtNbitmap, menu->image); n++; + } } XtSetArg(args[n], XtNhighlightThickness, 0); n++; type = commandWidgetClass; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4017, +/**/ 4016, /**/ 4015,