changeset 8877:50e40f322e78 v7.4.1725

commit https://github.com/vim/vim/commit/3780bb923a688e0051a9a23474eeb38a8acb695a Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 12 22:18:53 2016 +0200 patch 7.4.1725 Problem: Compiler errors for non-ANSI compilers. Solution: Remove // comment. Remove comma at end of enum. (Michael Jarvis)
author Christian Brabandt <cb@256bit.org>
date Tue, 12 Apr 2016 22:30:06 +0200
parents 47f17f66da3d
children ff724c3a0746
files src/eval.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -7005,7 +7005,7 @@ garbage_collect(void)
 #endif
 
 #ifdef FEAT_JOB_CHANNEL
-//    abort = abort || set_ref_in_channel(copyID);
+    abort = abort || set_ref_in_channel(copyID);
 #endif
 
     if (!abort)
@@ -9472,7 +9472,7 @@ typedef enum
     ASSERT_NOTEQUAL,
     ASSERT_MATCH,
     ASSERT_NOTMATCH,
-    ASSERT_OTHER,
+    ASSERT_OTHER
 } assert_type_T;
 
 static void prepare_assert_error(garray_T*gap);
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1725,
+/**/
     1724,
 /**/
     1723,