From 36fe7b287e13a7534c9aa6dcf0c3d7f8363f6060 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 25 Nov 2020 15:45:38 +0100
Subject: patch 8.2.2047: Amiga: FEAT_ARP defined when it should not
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    Amiga: FEAT_ARP defined when it should not.
Solution:   Adjust #ifdef. (Ola Söder, closes #7370)
---
 src/feature.h | 4 ++--
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/feature.h b/src/feature.h
index 0c68f79f2a..028eebcc72 100644
--- 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
index f7c1f45114..e59297f6ee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2047,
 /**/
     2046,
 /**/
-- 
cgit v1.2.3