From d2338ce397c3a8eb83875c589e952280c1bd57bc Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Tue, 18 Nov 2014 14:08:08 +0100
Subject: Wconversion: Fix warnings in cursor_shape.c.

---
 src/nvim/CMakeLists.txt | 1 -
 src/nvim/cursor_shape.c | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index e3e3c05cfb..c8eab4629a 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -42,7 +42,6 @@ list(REMOVE_ITEM NEOVIM_SOURCES ${to_remove})
 set(CONV_SOURCES
   buffer.c
   charset.c
-  cursor_shape.c
   diff.c
   digraph.c
   edit.c
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 328b751693..06c8186bf9 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <stdint.h>
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/cursor_shape.h"
@@ -52,7 +53,6 @@ char_u *parse_shape_opt(int what)
   int all_idx;
   int len;
   int i;
-  long n;
   int found_ve = FALSE;                 /* found "ve" flag */
   int round;
 
@@ -135,7 +135,9 @@ char_u *parse_shape_opt(int what)
               p += len;
               if (!VIM_ISDIGIT(*p))
                 return (char_u *)N_("E548: digit expected");
-              n = getdigits(&p);
+              long digits = getdigits(&p);
+              assert(digits <= INT_MAX);
+              int n = (int)digits;
               if (len == 3) {               /* "ver" or "hor" */
                 if (n == 0)
                   return (char_u *)N_("E549: Illegal percentage");
-- 
cgit