summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/popupmnu.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/popupmnu.c b/src/popupmnu.c
index 0afa0b7bc..44ed87804 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -558,8 +558,11 @@ pum_set_selected(n, repeat)
win_T *curwin_save = curwin;
int res = OK;
- /* Open a preview window. 3 lines by default. */
+ /* Open a preview window. 3 lines by default. Prefer
+ * 'previewheight' if set and smaller. */
g_do_tagpreview = 3;
+ if (p_pvh > 0 && p_pvh < g_do_tagpreview)
+ g_do_tagpreview = p_pvh;
resized = prepare_tagpreview(FALSE);
g_do_tagpreview = 0;
diff --git a/src/version.c b/src/version.c
index 344fc3b65..8e5e90af9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 44,
+/**/
43,
/**/
42,