changeset 10094:61dc69646af6 v7.4.2318

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.
author Christian Brabandt <cb@256bit.org>
date Sat, 03 Sep 2016 20:15:05 +0200
parents 7598d04404af
children cffb4068cb0b
files src/ex_getln.c src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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,