summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-03-15 17:08:51 +0000
committerBram Moolenaar <Bram@vim.org>2023-03-15 17:08:51 +0000
commite638acc9274112ca5ac6b610b01e44ab2a1e19ce (patch)
tree1806cfefa331c8c4eae6d6e80001302882ae92df
parente764d1b4219e6615a04df1c3a6a5c0210a0a7dac (diff)
patch 9.0.1404: compilation error with some compilersv9.0.1404
Problem: Compilation error with some compilers. Solution: Adjust array initialization. (John Marriott)
-rw-r--r--src/popupmenu.c15
-rw-r--r--src/version.c2
2 files changed, 13 insertions, 4 deletions
diff --git a/src/popupmenu.c b/src/popupmenu.c
index f2e9f50387..ea52d80043 100644
--- 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 7055dc1a95..cad03e6811 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1404,
+/**/
1403,
/**/
1402,