kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-01-01 17:23:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4644 from KillTheMule/vim-7.4.882

Browse Source 
vim-patch:7.4.882
This commit is contained in:
Justin M. Keyes 2016-05-04 21:53:10 -04:00
commit 4ac5a0a924
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/edit.c
View File

@ -3306,6 +3306,12 @@ static bool ins_compl_prep(int c)
showmode(); showmode();
} }
// Avoid the popup menu remains displayed when leaving the
// command line window.
if (c == Ctrl_C && cmdwin_type != 0) {
update_screen(0);
}
/* /*
* Indent now if a key was typed that is in 'cinkeys'. * Indent now if a key was typed that is in 'cinkeys'.
*/ */

2
src/nvim/version.c
View File

@ -796,7 +796,7 @@ static int included_patches[] = {
885, 885,
// 884 NA // 884 NA
883, 883,
// 882, 882,
881, 881,
// 880 NA // 880 NA
879, 879,

48
test/functional/viml/completion_spec.lua
View File

@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')
local Screen = require('test.functional.ui.screen') local Screen = require('test.functional.ui.screen')
local clear, feed = helpers.clear, helpers.feed local clear, feed = helpers.clear, helpers.feed
local eval, eq, neq = helpers.eval, helpers.eq, helpers.neq local eval, eq, neq = helpers.eval, helpers.eq, helpers.neq
local insert = helpers.insert
local execute, source, expect = helpers.execute, helpers.source, helpers.expect local execute, source, expect = helpers.execute, helpers.source, helpers.expect
describe('completion', function() describe('completion', function()
@ -713,5 +714,52 @@ describe('completion', function()
{3:-- Keyword completion (^N^P) }{4:match 2 of 2} | {3:-- Keyword completion (^N^P) }{4:match 2 of 2} |
]]) ]])
end) end)
describe('from the commandline window', function()
it('is cleared after CTRL-C', function ()
feed('q:')
feed('ifoo faa fee f')
screen:expect([[
|
{8:[No Name] }|
:foo faa fee f^ |
:~ |
:~ |
:~ |
{9:[Command Line] }|
{3:-- INSERT --} |
]], {[3] = {bold = true},
[4] = {bold = true, foreground = Screen.colors.SeaGreen},
[8] = {reverse = true},
[9] = {bold = true, reverse = true}})
feed('<c-x><c-n>')
screen:expect([[
|
{8:[No Name] }|
:foo faa fee foo^ |
:~ {2: foo } |
:~ {1: faa } |
:~ {1: fee } |
{9:[Command Line] }|
{3:-- Keyword Local completion (^N^P) }{4:match 1 of 3} |
]],{[1] = {background = Screen.colors.LightMagenta},
[2] = {background = Screen.colors.Grey},
[3] = {bold = true},
[4] = {bold = true, foreground = Screen.colors.SeaGreen},
[8] = {reverse = true},
[9] = {bold = true, reverse = true}})
feed('<c-c>')
screen:expect([[
|
{8:[No Name] }|
:foo faa fee foo |
:~ |
:~ |
:~ |
{9:[Command Line] }|
:foo faa fee foo^ |
]], {[8] = {reverse = true}, [9] = {bold = true, reverse = true}})
end)
end)
end) end)