From c3990ba0e6fdc24bda029d55cd74ce00eda85b10 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Tue, 4 Oct 2016 23:09:41 +0900
Subject: [PATCH 1/2] vim-patch:7.4.1714

Problem:    Non-GUI specific settings in the gvimrc_example file.
Solution:   Move some settings to the vimrc_example file.  Remove setting
            'hlsearch' again. (suggested by Hirohito Higashi)

https://github.com/vim/vim/commit/54f1b7abf8c48b1dd997202258d1d0673ed4bd29
---
 runtime/vimrc_example.vim | 6 ++++++
 src/nvim/version.c        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index c53dde8ceb..17cba123a8 100644
--- a/runtime/vimrc_example.vim
+++ b/runtime/vimrc_example.vim
@@ -19,6 +19,12 @@ inoremap <C-U> <C-G>u<C-U>
 " Switch syntax highlighting on
 syntax on
 
+" Also switch on highlighting the last used search pattern.
+set hlsearch
+
+" I like highlighting strings inside C comments.
+let c_comment_strings=1
+
 " Enable file type detection.
 " Use the default filetype settings, so that mail gets 'textwidth' set to 72,
 " 'cindent' is on in C files, etc.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 302e78cb6c..23cac97615 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -729,7 +729,7 @@ static int included_patches[] = {
   // 1717 NA
   1716,
   // 1715,
-  // 1714,
+  1714,
   // 1713 NA
   1712,
   // 1711,

From fdb0a5e24eb7fab77ae0d206a00c07b48414a481 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Tue, 4 Oct 2016 23:15:16 +0900
Subject: [PATCH 2/2] vim-patch:7.4.1765

Problem:    Undo options are not together in the options window.
Solution:   Put them together.  (Gary Johnson)

https://github.com/vim/vim/commit/4694a17d1ec08382f996990a7fac1ac60197ec81
---
 runtime/optwin.vim | 8 ++++----
 src/nvim/version.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 890c183a5a..2ad87d1062 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -710,6 +710,10 @@ call <SID>Header("editing text")
 call append("$", "undolevels\tmaximum number of changes that can be undone")
 call append("$", "\t(global or local to buffer)")
 call append("$", " \tset ul=" . &ul)
+call append("$", "undofile\tautomatically save and restore undo history")
+call <SID>BinOptionG("udf", &udf)
+call append("$", "undodir\tlist of directories for undo files")
+call <SID>OptionG("udir", &udir)
 call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload")
 call append("$", " \tset ur=" . &ur)
 call append("$", "modified\tchanges have been made and not written to a file")
@@ -1032,10 +1036,6 @@ if has("vertsplit")
   call append("$", "cmdwinheight\theight of the command-line window")
   call <SID>OptionG("cwh", &cwh)
 endif
-call append("$", "undofile\tautomatically save and restore undo history")
-call <SID>BinOptionG("udf", &udf)
-call append("$", "undodir\tlist of directories for undo files")
-call <SID>OptionG("udir", &udir)
 
 
 call <SID>Header("executing external commands")
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 23cac97615..a81d8f89c5 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -677,7 +677,7 @@ static int included_patches[] = {
   // 1768,
   // 1767 NA
   // 1766 NA
-  // 1765,
+  1765,
   // 1764 NA
   // 1763,
   // 1762,