patch 7.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.
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 1627ee7..59fa288 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1657,9 +1657,9 @@
#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 @@
}
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 fd8d713..40d6dc6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2318,
+/**/
2317,
/**/
2316,
