diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-10 17:04:58 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-10 17:04:58 -0400 |
| commit | 867bdae5c2399040af9a6885c279ec1838fc756a (patch) | |
| tree | 827b1717cbedd9f6e711f191901d3e25967ac219 /src | |
| parent | 34c418fceb457bb21bf365311ce558d2d616b24a (diff) | |
| parent | 1fb80d24eba04eb4a129ce41651e9de11fa332a1 (diff) | |
| download | rneovim-867bdae5c2399040af9a6885c279ec1838fc756a.tar.gz rneovim-867bdae5c2399040af9a6885c279ec1838fc756a.tar.bz2 rneovim-867bdae5c2399040af9a6885c279ec1838fc756a.zip | |
Merge pull request #1158 from atwupack/vp-7.4.337
vim-patch:7.4.337
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_getln.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 69fb1d344a..810df627c1 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -287,6 +287,14 @@ getcmdline ( do_digraph(-1); /* init digraph typeahead */ + // If something above caused an error, reset the flags, we do want to type + // and execute commands. Display may be messed up a bit. + if (did_emsg) { + redrawcmd(); + } + did_emsg = FALSE; + got_int = FALSE; + /* * Collect the command string, handling editing keys. */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 092d21f580..ebb6f5c4ed 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -258,7 +258,7 @@ static int included_patches[] = { //340 NA 339, 338, - //337, + 337, //336, 335, 334, |