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

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 3780bb923a688e0051a9a23474eeb38a8acb695a
Author: Bram Moolenaar <Bram at 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)
---
 src/eval.c    | 4 ++--
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

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 @@ 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);
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 char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1725,
+/**/
     1724,
 /**/
     1723,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git