commit 3780bb923a688e0051a9a23474eeb38a8acb695a
author Bram Moolenaar <Bram@vim.org> Tue Apr 12 22:18:53 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Apr 12 22:18:53 2016 +0200
tree 0670ec7af05a34fad5161b402b3861d291a148f0
parent 03413f44167c4b5cd0012def9bb331e2518c83cf

patch 7.4.1725
Problem:    Compiler errors for non-ANSI compilers.
Solution:   Remove // comment.  Remove comma at end of enum. (Michael Jarvis)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 0c270b9..a14a721 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7005,7 +7005,7 @@
 #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 @@
     ASSERT_NOTEQUAL,
     ASSERT_MATCH,
     ASSERT_NOTMATCH,
-    ASSERT_OTHER,
+    ASSERT_OTHER
 } assert_type_T;
 
 static void prepare_assert_error(garray_T*gap);

src/version.c

diff --git a/src/version.c b/src/version.c
index e422527..5ca0219 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1725,
+/**/
     1724,
 /**/
     1723,