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/os/env.c  | 2 +-
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index ea0e992fe2..41ce8ddbc2 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -278,7 +278,7 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
       }
       memcpy((char *)dst, (char *)var, len);
       dst += len;
-      dstlen -= len;
+      dstlen -= (int)len;
       continue;
     }
     copy_char = true;
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