patch 9.0.1404: compilation error with some compilers

Problem:    Compilation error with some compilers.
Solution:   Adjust array initialization. (John Marriott)

diff --git a/src/popupmenu.c b/src/popupmenu.c
index f2e9f50387552b679c4d89d8bcba67b4f2a603b5..ea52d8004369a26ff6528e54951a6a71a44054c4 100644 (file)
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -434,10 +434,17 @@ pum_redraw(void)
     int                round;
     int                n;
 
-    int *ha = highlight_attr;
-    //                  "word"         "kind"          "extra text"
-    int        attrsNorm[3] = { ha[HLF_PNI],   ha[HLF_PNK],    ha[HLF_PNX] };
-    int        attrsSel[3] =  { ha[HLF_PSI],   ha[HLF_PSK],    ha[HLF_PSX] };
+    int                attrsNorm[3];
+    int                attrsSel[3];
+    // "word"
+    attrsNorm[0] = highlight_attr[HLF_PNI];
+    attrsSel[0] = highlight_attr[HLF_PSI];
+    // "kind"
+    attrsNorm[1] = highlight_attr[HLF_PNK];
+    attrsSel[1] = highlight_attr[HLF_PSK];
+    // "extra text"
+    attrsNorm[2] = highlight_attr[HLF_PNX];
+    attrsSel[2] = highlight_attr[HLF_PSX];
 
     if (call_update_screen)
     {

diff --git a/src/version.c b/src/version.c
index 7055dc1a950c47762667c4333abb4167d75206a0..cad03e68111757afeba5c232a4067ffabf5caa3c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1404,
 /**/
     1403,
 /**/