summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormathew <glephunter@gmail.com>2023-08-26 18:11:02 +0200
committerChristian Brabandt <cb@256bit.org>2023-08-26 18:11:31 +0200
commit20f61d96f8f36e7c0994f49b43d0eb78f5274cca (patch)
tree20766dd3b83233aa64b9f8c9d3c4eff5c03ec01d
parent4c215ecdafbc9a32bca885abc3272be741047291 (diff)
patch 9.0.1789: too early declaration of variable in pum_set_selected()v9.0.1789
Problem: too early declaration of variable in pum_set_selected() Solution: Move declaration to where it is actually used closes: #12915 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: mathew <glephunter@gmail.com>
-rw-r--r--src/popupmenu.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/popupmenu.c b/src/popupmenu.c
index 079fe81e8c..741980660f 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -835,7 +835,6 @@ pum_set_selected(int n, int repeat UNUSED)
{
win_T *curwin_save = curwin;
tabpage_T *curtab_save = curtab;
- int res = OK;
# ifdef FEAT_PROP_POPUP
use_popup_T use_popup;
# else
@@ -875,6 +874,8 @@ pum_set_selected(int n, int repeat UNUSED)
# endif
)
{
+ int res = OK;
+
if (!resized
&& curbuf->b_nwindows == 1
&& curbuf->b_fname == NULL
diff --git a/src/version.c b/src/version.c
index d6e259c014..eb7d598eeb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1789,
+/**/
1788,
/**/
1787,