# HG changeset patch # User Bram Moolenaar # Date 1606316404 -3600 # Node ID e5de71dd168b551538fb20ebe00a84ac8a3ff065 # Parent 8b25ffc3babfc5f966ebe59230bb499e1757eb91 patch 8.2.2047: Amiga: FEAT_ARP defined when it should not Commit: https://github.com/vim/vim/commit/36fe7b287e13a7534c9aa6dcf0c3d7f8363f6060 Author: Bram Moolenaar Date: Wed Nov 25 15:45:38 2020 +0100 patch 8.2.2047: Amiga: FEAT_ARP defined when it should not Problem: Amiga: FEAT_ARP defined when it should not. Solution: Adjust #ifdef. (Ola S?der, closes https://github.com/vim/vim/issues/7370) diff --git a/src/feature.h b/src/feature.h --- a/src/feature.h +++ b/src/feature.h @@ -1089,11 +1089,11 @@ /* * +ARP Amiga only. Use arp.library, DOS 2.0 is not required. */ -#if !defined(NO_ARP) && !defined(__amigaos4__) +#if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \ + && !defined(__MORPHOS__) || !defined(__AROS__) # define FEAT_ARP #endif - /* * +ole Win32 OLE automation: Use Makefile.ovc. */ diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2047, +/**/ 2046, /**/ 2045,