diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-03 20:04:34 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-03 20:04:34 +0200 |
| commit | 349e7d94e6bbb253bb87adad9039f095128ab543 (patch) | |
| tree | eca82c3c71ab11c9f9810d8081818ecd8aec07b1 | |
| parent | 0913a1089a07ac7b17abc3a1343dfa7cd25613f4 (diff) | |
patch 7.4.2318v7.4.2318
Problem: When 'incsearch' is not set CTRL-T and CTRL-G are not inserted as
before.
Solution: Move #ifdef and don't use goto.
| -rw-r--r-- | src/ex_getln.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 1627ee74f7..59fa288067 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1657,9 +1657,9 @@ getcmdline( #endif goto cmdline_not_changed; +#ifdef FEAT_SEARCH_EXTRA case Ctrl_G: /* next match */ case Ctrl_T: /* previous match */ -#ifdef FEAT_SEARCH_EXTRA if (p_is && !cmd_silent && (firstc == '/' || firstc == '?')) { pos_T t; @@ -1724,8 +1724,9 @@ getcmdline( } else vim_beep(BO_ERROR); + goto cmdline_not_changed; } - goto cmdline_not_changed; + break; #endif case Ctrl_V: diff --git a/src/version.c b/src/version.c index fd8d713dbe..40d6dc6b01 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2318, +/**/ 2317, /**/ 2316, |