From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 27 Oct 2010 15:11:15 +0000 (+0200)
Subject: updated for version 7.3.044
X-Git-Tag: v7.3.044
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee236d0d199d627193b0d61a2b3b8bbda323afd6;p=vim

updated for version 7.3.044
Problem:    The preview window opened by the popup menu is larger than
            specified with 'previewheight'. (Benjamin Haskell)
Solution:   Use 'previewheight' if it's set and smaller.
---

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
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    44,
 /**/
     43,
 /**/