From 4431975210b58c6b0403ee50172bad3c8729bbb2 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sat, 10 Dec 2016 17:02:02 +0900
Subject: vim-patch:0 completion-related patches #5745 #5829

vim-patch:8.0.0058

Problem:    Positioning of the popup menu is not good.
Solution:   Position it better. (Hirohito Higashi)

https://github.com/vim/vim/commit/91e44a3305ef6bf2d43496c351dcff0a45c6bfb8

vim-patch:8.0.0099

Problem:    Popup menu always appears above the cursor when it is in the lower
            half of the screen. (Matt Gardner)
Solution:   Compute the available space better. (Hirohito Higashi,
            closes vim/vim#1241)

https://github.com/vim/vim/commit/73095288da839f7c738a49baa109773e76106806

vim-patch:8.0.0127

Problem:    Cancelling completion still inserts text when formatting is done
            for 'textwidth'. (lacygoill)
Solution:   Don't format when CTRL-E was typed. (Hirohito Higashi,
            closes vim/vim#1312)

https://github.com/vim/vim/commit/73fd4988866c3adc15b5d093efdf5e8cf70d093d

vim-patch:7.4.2188

Problem:    Completion does not work properly with some plugins.
Solution:   Revert the part related to typing CTRL-E. (closes vim/vim#972)

https://github.com/vim/vim/commit/c9fb77c69244870a97384152f20845665c19fe39

vim-patch:7.4.2146

Problem:    Not enough testing for popup menu.  CTRL-E does not always work
            properly.
Solution:   Add more tests.  When using CTRL-E check if the popup menu is
            visible. (Christian Brabandt)

https://github.com/vim/vim/commit/472472898ab71ac80a86fedc37f8eb91461788dd

vim-patch:7.4.2147

Problem:    test_alot fails.
Solution:   Close window.

https://github.com/vim/vim/commit/abb71fbd399772d467aaa7b34b958b0f975c7e65

vim-patch:7.4.2149

Problem:    If a test leaves a window open a following test may fail.
Solution:   Always close extra windows after running a test.

https://github.com/vim/vim/commit/7cba71d7e3576639679b6a3aedeeb1ac07f7f2f5

vim-patch:7.4.2321

Problem:    When a test is commented out we forget about it.
Solution:   Let a test throw an exception with "Skipped" and list skipped test
            functions. (Christian Brabandt)

https://github.com/vim/vim/commit/dac1947bb366ef43cd6da95acc730554e76d8b84

vim-patch:7.4.2331

Problem:    Using CTRL-X CTRL-V to complete a command line from Insert mode
            does not work after entering an expression on the command line.
Solution:   Don't use "ccline" when not actually using a command line. (test
            by Hirohito Higashi)

https://github.com/vim/vim/commit/33a80eeb859a78ba93432da6fa585786cfd77249

vim-patch:8.0.0008

Problem:    Popup complete test is disabled.
Solution:   Enable the test and change the assert. (Hirohito Higashi)

https://github.com/vim/vim/commit/9e02cfa226b2577ec867b544a1a450a428a19880

vim-patch:8.0.0047

Problem:    Crash when using the preview window from an unnamed buffer.
            (lifepillar)
Solution:   Do not clear the wrong buffer. (closes vim/vim#1200)

https://github.com/vim/vim/commit/50e5376926dc2ec4a26a7a16f8f0f3213c4afdf0

vim-patch:8.0.0053

Problem:    No test for what 8.0.0047 fixes.
Solution:   Add a test. (Hirohito Higashi)

https://github.com/vim/vim/commit/60ef3e81f4a54d9f7ee617d57021f0811ec8ada5
---
 src/nvim/version.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/nvim/version.c')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 220e0fc7af..72b39ba974 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -109,7 +109,7 @@ static int included_patches[] = {
   // 2334,
   // 2333,
   // 2332 NA
-  // 2331,
+  2331,
   // 2330,
   // 2329,
   // 2328,
@@ -119,7 +119,7 @@ static int included_patches[] = {
   // 2324,
   // 2323,
   // 2322,
-  // 2321,
+  2321,
   // 2320,
   // 2319 NA
   // 2318,
@@ -252,7 +252,7 @@ static int included_patches[] = {
   // 2191 NA
   // 2190,
   // 2189,
-  // 2188,
+  2188,
   // 2187,
   // 2186 NA
   // 2185,
@@ -291,10 +291,10 @@ static int included_patches[] = {
   // 2152,
   // 2151,
   // 2150 NA
-  // 2149,
+  2149,
   // 2148,
-  // 2147,
-  // 2146,
+  2147,
+  2146,
   // 2145 NA
   // 2144,
   // 2143,
-- 
cgit