From c3990ba0e6fdc24bda029d55cd74ce00eda85b10 Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Tue, 4 Oct 2016 23:09:41 +0900 Subject: 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 --- src/nvim/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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, -- cgit From fdb0a5e24eb7fab77ae0d206a00c07b48414a481 Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Tue, 4 Oct 2016 23:15:16 +0900 Subject: 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 --- src/nvim/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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, -- cgit