From 3679752dbd9191f4067a43143da637478cc389f1 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sun, 25 Jun 2017 12:11:22 -0400
Subject: vim-patch:7.4.2318

Problem:    When 'incsearch' is not set CTRL-T and CTRL-G are not inserted as
            before.
Solution:   Move vim/vim#ifdef and don't use goto.

https://github.com/vim/vim/commit/349e7d94e6bbb253bb87adad9039f095128ab543
---
 src/nvim/ex_getln.c | 3 ++-
 src/nvim/version.c  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 62f802fb8f..45fff4f9d7 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -1489,8 +1489,9 @@ static int command_line_handle_key(CommandLineState *s)
       } else {
         vim_beep(BO_ERROR);
       }
+      return command_line_not_changed(s);
     }
-    return command_line_not_changed(s);
+    break;
 
   case Ctrl_V:
   case Ctrl_Q:
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 23c2fac28a..5a107f0023 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -126,7 +126,7 @@ static const int included_patches[] = {
   2321,
   // 2320,
   // 2319 NA
-  // 2318,
+  2318,
   2317,
   // 2316 NA
   2315,
-- 
cgit