Mercurial > vim

changeset 23001:e5de71dd168b v8.2.2047

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2047: Amiga: FEAT_ARP defined when it should not Commit: https://github.com/vim/vim/commit/36fe7b287e13a7534c9aa6dcf0c3d7f8363f6060 Author: Bram Moolenaar <Bram@vim.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Wed, 25 Nov 2020 16:00:04 +0100
parents 8b25ffc3babf
children afbb070a1828
files src/feature.h src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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.
  */
--- 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,