From c8561ecf268c498b41eb36c18f3eda1557b7bdc1 Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Fri, 12 Feb 2016 16:29:05 +0900
Subject: vim-patch:7.4.831

Problem:    When expanding `=expr` on the command line and encountering an
            error, the command is executed anyway.
Solution:   Bail out when an error is detected.

https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
---
 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 7d4b8982cd..6fdad105e4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -459,7 +459,7 @@ static int included_patches[] = {
   834,
   833,
   // 832,
-  // 831,
+  831,
   830,
   // 829 NA
   828,
-- 
cgit 


From 6ea1047585664608cb42e007ba87ad86109ae3f8 Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Fri, 12 Feb 2016 22:59:34 +0900
Subject: vim-patch:7.4.832

Problem:    $HOME in `=$HOME . '/.vimrc'` is expanded too early.
Solution:   Skip over `=expr` when expanding environment names.

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

---

To reproduce:

```sh
nvim -u NONE -c 'e `=$HOME . "/.vimrc"`'
```
---
 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 6fdad105e4..7f400773b0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -458,7 +458,7 @@ static int included_patches[] = {
   835,
   834,
   833,
-  // 832,
+  832,
   831,
   830,
   // 829 NA
-- 
cgit 


From 6bbd149e9812161a736863f68400ff394e649b5e Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Sat, 13 Feb 2016 13:21:44 +0900
Subject: vim-patch:7.4.845

Problem:    Compiler warning for possible loss of data.
Solution:   Add a type cast. (Erich Ritz)

https://github.com/vim/vim/commit/5df1ed2de3fa9dcace996b9a0a4c9b3cea79cf1e
---
 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 7f400773b0..a3ada277b7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -445,7 +445,7 @@ static int included_patches[] = {
   848,
   847,
   // 846 NA
-  // 845,
+  845,
   844,
   843,
   // 842 NA
-- 
cgit 


From d6c894efaf81032753f74b943c138c53e0d1fcaf Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Sat, 13 Feb 2016 10:52:00 +0900
Subject: vim-patch:7.4.903

Problem:    MS-Windows: When 'encoding' differs from the current code page,
            expandinig wildcards may cause illegal memory access.
Solution:   Allocate a longer buffer. (Ken Takata)

https://github.com/vim/vim/commit/7314efd87d8c4095229bdc2867a553c36c064918
---
 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 a3ada277b7..fbace9ec93 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -387,7 +387,7 @@ static int included_patches[] = {
   // 906 NA
   // 905,
   // 904,
-  // 903,
+  903,
   // 902 NA
   // 901,
   // 900 NA
-- 
cgit