From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 3 Sep 2016 18:04:34 +0000 (+0200)
Subject: patch 7.4.2318
X-Git-Tag: v7.4.2318
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=349e7d94e6bbb253bb87adad9039f095128ab543;p=vim

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 1627ee74f..59fa28806 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 fd8d713db..40d6dc6b0 100644
--- 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,
 /**/