summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-02 23:13:27 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-02 23:13:27 +0200
commit66cd19fef1c5e86d798db164cc29f8ec2793411d (patch)
tree542f682c1cdc8cc7fd6ef782639e4783b2ca1c65
parent223896d3e9d4d511fc38fd9ee27ba16318733df6 (diff)
patch 8.0.0843: MS-Windows: compiler warning for signed/unsignedv8.0.0843
Problem: MS-Windows: compiler warning for signed/unsigned. Solution: Add type cast. (Yasuhiro Matsumoto, closes #1912)
-rw-r--r--src/terminal.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 5622ce3596..53edb83c8b 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -968,7 +968,7 @@ terminal_loop(void)
/* We don't know if the job can handle CTRL-C itself or not, this
* may kill the shell instead of killing the command running in the
* shell. */
- mch_stop_job(curbuf->b_term->tl_job, "quit")
+ mch_stop_job(curbuf->b_term->tl_job, (char_u *)"quit")
#endif
if (c == (termkey == 0 ? Ctrl_W : termkey))
diff --git a/src/version.c b/src/version.c
index 0ef1f452b0..2db4ca9214 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 843,
+/**/
842,
/**/
841,