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 vim#7375)
k-takata · Nov 25, 2020 · d49a35a · d49a35a
1 parent c2ca935
commit d49a35a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2054,
 /**/
     2053,
 /**/