From: Bram Moolenaar Date: Tue, 12 Apr 2016 20:18:53 +0000 (+0200) Subject: patch 7.4.1725 X-Git-Tag: v7.4.1725 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3780bb923a688e0051a9a23474eeb38a8acb695a;p=vim patch 7.4.1725 Problem: Compiler errors for non-ANSI compilers. Solution: Remove // comment. Remove comma at end of enum. (Michael Jarvis) --- diff --git a/src/eval.c b/src/eval.c index 0c270b928..a14a721a0 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 e422527ef..5ca02192f 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1725, /**/ 1724, /**/