Mercurial > vim

changeset 23015:0338b74add2f v8.2.2054

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2054: Amiga: FEAT_ARP defined when it should not Commit: https://github.com/vim/vim/commit/d49a35a1c3b736637733b36011fccbee7ef43fcf Author: Bram Moolenaar <Bram@vim.org> Date: Wed Nov 25 21:55:45 2020 +0100 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 https://github.com/vim/vim/issues/7375)
author Bram Moolenaar <Bram@vim.org>
date Wed, 25 Nov 2020 22:00:06 +0100
parents 74677f39e8da
children 7f40dcbf9222
files src/feature.h src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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 */
 /**/
+    2054,
+/**/
     2053,
 /**/
     2052,