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 1627ee74f7c9a4815b9bd89842b7fc68a4572bae..59fa288067bd1f86c7065a178085768e0b78476c 100644 (file)
--- 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 fd8d713dbe357c29cdddeb06608bb0415d260e17..40d6dc6b01690bee4043e6e42be7376b50ef675e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2318,
 /**/
     2317,
 /**/