From d25a59f4d0c357fd4df4adc8e2d60497f742c41a Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Mon, 25 Jan 2016 03:55:47 +0900
Subject: vim-patch:7.4.639

Problem:    Combination of linebreak and conceal doesn't work well.
Solution:   Fix the display problems. (Christian Brabandt)

https://github.com/vim/vim/commit/8fc6bc71266e342d339c851b3ee472357f917597
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index bf1986d3ba..2ffe41d6fd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -485,7 +485,7 @@ static int included_patches[] = {
   642,
   // 641 NA
   640,
-  // 639,
+  639,
   // 638 NA
   637,
   636,
-- 
cgit 


From 8771e84db7f795dd15b04efa585f772b8b7e705d Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Mon, 25 Jan 2016 10:07:16 +0900
Subject: vim-patch:7.4.753

Problem:    Appending in Visual mode with 'linebreak' set does not work
            properly.  Also when 'selection' is "exclusive". (Ingo Karkat)
Solution:   Recalculate virtual columns. (Christian Brabandt)

https://github.com/vim/vim/commit/74db34cc9162445e3d500ab2d61c5c19ce9af0ca
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 2ffe41d6fd..9e2139c297 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -371,7 +371,7 @@ static int included_patches[] = {
   // 756 NA
   // 755,
   // 754,
-  // 753,
+  753,
   // 752,
   // 751 NA
   // 750 NA
-- 
cgit 


From 8721e1fe088943134fe67ee267a9e6b27df291f0 Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Mon, 25 Jan 2016 11:24:58 +0900
Subject: vim-patch:7.4.949

Problem:    When using 'colorcolumn' and there is a sign with a fullwidth
            character the highlighting is wrong. (Andrew Stewart)
Solution:   Only increment vcol when in the right state. (Christian Brabandt)

https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9e2139c297..1efabe9b1b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -175,7 +175,7 @@ static int included_patches[] = {
   // 952,
   // 951,
   950,
-  // 949,
+  949,
   // 948 NA
   // 947,
   946,
-- 
cgit 


From db51ff10f40f4f65b2b32ca1f9d3ff80f87752b9 Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Mon, 25 Jan 2016 12:09:17 +0900
Subject: vim-patch:7.4.963

Problem:    test_listlbr_utf8 sometimes fails.
Solution:   Don't use a literal multibyte character but <C-V>uXXXX. Do not
            dump the screen highlighting. (Christian Brabandt, closes #518)

https://github.com/vim/vim/commit/1c57fe8b9450eb29c3e42a94527d4b7514f853e2
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1efabe9b1b..41bcd7d738 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -161,7 +161,7 @@ static int included_patches[] = {
   // 966 NA
   // 965 NA
   // 964 NA
-  // 963,
+  963,
   // 962 NA
   // 961,
   // 960 NA
-- 
cgit