diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-06-25 12:11:22 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-06-26 22:08:13 -0400 |
| commit | 3679752dbd9191f4067a43143da637478cc389f1 (patch) | |
| tree | 8dc20f860ab377eb22e6a53d0b5cd53f3b9e0901 /src | |
| parent | 0dd64556590633b2cab7cd846b28bbf5f7ef35d4 (diff) | |
| download | rneovim-3679752dbd9191f4067a43143da637478cc389f1.tar.gz rneovim-3679752dbd9191f4067a43143da637478cc389f1.tar.bz2 rneovim-3679752dbd9191f4067a43143da637478cc389f1.zip | |
vim-patch:7.4.2318
Problem: When 'incsearch' is not set CTRL-T and CTRL-G are not inserted as
before.
Solution: Move vim/vim#ifdef and don't use goto.
https://github.com/vim/vim/commit/349e7d94e6bbb253bb87adad9039f095128ab543
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_getln.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 62f802fb8f..45fff4f9d7 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1489,8 +1489,9 @@ static int command_line_handle_key(CommandLineState *s) } else { vim_beep(BO_ERROR); } + return command_line_not_changed(s); } - return command_line_not_changed(s); + break; case Ctrl_V: case Ctrl_Q: diff --git a/src/nvim/version.c b/src/nvim/version.c index 23c2fac28a..5a107f0023 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -126,7 +126,7 @@ static const int included_patches[] = { 2321, // 2320, // 2319 NA - // 2318, + 2318, 2317, // 2316 NA 2315, |