diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-11-25 21:55:45 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-11-25 21:55:45 +0100 |
commit | d49a35a1c3b736637733b36011fccbee7ef43fcf (patch) | |
tree | 47717dfbbb2c977ae2b2da3ea2584542b143b31a | |
parent | c2ca935d26b3fc64a13d4e7d0583fc787efe61d0 (diff) | |
download | vim-git-d49a35a1c3b736637733b36011fccbee7ef43fcf.tar.gz |
patch 8.2.2054: Amiga: FEAT_ARP defined when it should notv8.2.2054
Problem: Amiga: FEAT_ARP defined when it should not.
Solution: Adjust "||" to "&&" in #ifdef. (Ola Söder, closes #7375)
-rw-r--r-- | src/feature.h | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2054, +/**/ 2053, /**/ 2052, |