# HG changeset patch # User Christian Brabandt # Date 1460493006 -7200 # Node ID 50e40f322e78c7868b6555dfbbc13c8aa996ca3a # Parent 47f17f66da3da003118c5335624b4c63918ad9e9 commit https://github.com/vim/vim/commit/3780bb923a688e0051a9a23474eeb38a8acb695a Author: Bram Moolenaar 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) diff --git a/src/eval.c b/src/eval.c --- 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 --- 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,