summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Pelle <dominique.pelle@gmail.com>2022-01-06 12:35:31 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-06 12:35:31 +0000
commita33737b6d80f5461c1c6c4c96b5bc4964a737927 (patch)
tree66ac08ae8846308eee950ba99691d13c7b840b64
parent58493cfae255adec2d5b407593b82d07abcc0975 (diff)
patch 8.2.4017: gcc warns for misleading indent in Athena menu codev8.2.4017
Problem: Gcc warns for misleading indent in Athena menu code. Solution: Add curlies around the two statements. (Dominique Pellé, closes #9480)
-rw-r--r--src/gui_athena.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui_athena.c b/src/gui_athena.c
index 4da832b220..db13bd34f7 100644
--- a/src/gui_athena.c
+++ b/src/gui_athena.c
@@ -1159,7 +1159,9 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx UNUSED)
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
index dafef8ec98..5776f3df18 100644
--- 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,