# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1472926505 -7200
# Node ID 61dc69646af69c6e3b045b20225d519b971b3b3e
# Parent  7598d04404af067c9b630b71727bbd1de9a40699
commit https://github.com/vim/vim/commit/349e7d94e6bbb253bb87adad9039f095128ab543
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Sep 3 20:04:34 2016 +0200

    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
--- 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
--- 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,