projects / people / ms / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 17e7d110 SS |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.044 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.044 | |
| 11 | Problem: The preview window opened by the popup menu is larger than | |
| 12 | specified with 'previewheight'. (Benjamin Haskell) | |
| 13 | Solution: Use 'previewheight' if it's set and smaller. | |
| 14 | Files: src/popupmnu.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.043/src/popupmnu.c 2010-08-15 21:57:25.000000000 +0200 | |
| 18 | --- src/popupmnu.c 2010-10-27 17:04:31.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 558,565 **** | |
| 21 | win_T *curwin_save = curwin; | |
| 22 | int res = OK; | |
| 23 | ||
| 24 | ! /* Open a preview window. 3 lines by default. */ | |
| 25 | g_do_tagpreview = 3; | |
| 26 | resized = prepare_tagpreview(FALSE); | |
| 27 | g_do_tagpreview = 0; | |
| 28 | ||
| 29 | --- 558,568 ---- | |
| 30 | win_T *curwin_save = curwin; | |
| 31 | int res = OK; | |
| 32 | ||
| 33 | ! /* Open a preview window. 3 lines by default. Prefer | |
| 34 | ! * 'previewheight' if set and smaller. */ | |
| 35 | g_do_tagpreview = 3; | |
| 36 | + if (p_pvh > 0 && p_pvh < g_do_tagpreview) | |
| 37 | + g_do_tagpreview = p_pvh; | |
| 38 | resized = prepare_tagpreview(FALSE); | |
| 39 | g_do_tagpreview = 0; | |
| 40 | ||
| 41 | *** ../vim-7.3.043/src/version.c 2010-10-27 16:49:41.000000000 +0200 | |
| 42 | --- src/version.c 2010-10-27 17:08:37.000000000 +0200 | |
| 43 | *************** | |
| 44 | *** 716,717 **** | |
| 45 | --- 716,719 ---- | |
| 46 | { /* Add new patch number below this line */ | |
| 47 | + /**/ | |
| 48 | + 44, | |
| 49 | /**/ | |
| 50 | ||
| 51 | -- | |
| 52 | "It's so simple to be wise. Just think of something stupid to say | |
| 53 | and then don't say it." -- Sam Levenson | |
| 54 | ||
| 55 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 56 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 57 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 58 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |