From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 25 Nov 2020 20:55:45 +0000 (+0100)
Subject: patch 8.2.2054: Amiga: FEAT_ARP defined when it should not
X-Git-Tag: v8.2.2054
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d49a35a1c3b736637733b36011fccbee7ef43fcf;p=vim

patch 8.2.2054: Amiga: FEAT_ARP defined when it should not

Problem:    Amiga: FEAT_ARP defined when it should not.
Solution:   Adjust "||" to "&&" in #ifdef. (Ola Söder, closes #7375)
---

diff --git a/src/feature.h b/src/feature.h
index 028eebcc7..8f7322bef 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1090,7 +1090,7 @@
  * +ARP			Amiga only. Use arp.library, DOS 2.0 is not required.
  */
 #if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \
-	&& !defined(__MORPHOS__) || !defined(__AROS__)
+	&& !defined(__MORPHOS__) && !defined(__AROS__)
 # define FEAT_ARP
 #endif
 
diff --git a/src/version.c b/src/version.c
index bd8abac7a..7b7bea9ee 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 */
+/**/
+    2054,
 /**/
     2053,
 /**/