diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-06-25 12:26:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-06-25 12:26:46 +0200 |
| commit | 15a35c4f4a1670dd6ca228068a451f78d2bf75e0 (patch) | |
| tree | 3e120d1ecd51030b00a8b76eb77ad85bb8a7af3a | |
| parent | 78159bbf9e241f162b1243853f45d08a3d81f1be (diff) | |
| download | vim-git-15a35c4f4a1670dd6ca228068a451f78d2bf75e0.tar.gz | |
updated for version 7.4.337v7.4.337
Problem: When there is an error preparing to edit the command line, the
command won't be executed. (Hirohito Higashi)
Solution: Reset did_emsg before editing.
| -rw-r--r-- | src/ex_getln.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 2678184bc..d000112e6 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -342,6 +342,13 @@ getcmdline(firstc, count, indent) do_digraph(-1); /* init digraph typeahead */ #endif + /* 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/version.c b/src/version.c index bb63095f1..2376b6983 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 337, +/**/ 336, /**/ 335, |