• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Révisione5de71dd168b551538fb20ebe00a84ac8a3ff065 (tree)
l'heure2020-11-26 00:00:04
AuteurBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Message de Log

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)

Change Summary

Modification

diff -r 8b25ffc3babf -r e5de71dd168b src/feature.h
--- a/src/feature.h Wed Nov 25 14:30:05 2020 +0100
+++ b/src/feature.h Wed Nov 25 16:00:04 2020 +0100
@@ -1089,11 +1089,11 @@
10891089 /*
10901090 * +ARP Amiga only. Use arp.library, DOS 2.0 is not required.
10911091 */
1092-#if !defined(NO_ARP) && !defined(__amigaos4__)
1092+#if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \
1093+ && !defined(__MORPHOS__) || !defined(__AROS__)
10931094 # define FEAT_ARP
10941095 #endif
10951096
1096-
10971097 /*
10981098 * +ole Win32 OLE automation: Use Makefile.ovc.
10991099 */
diff -r 8b25ffc3babf -r e5de71dd168b src/version.c
--- a/src/version.c Wed Nov 25 14:30:05 2020 +0100
+++ b/src/version.c Wed Nov 25 16:00:04 2020 +0100
@@ -751,6 +751,8 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 2047,
755+/**/
754756 2046,
755757 /**/
756758 2045,
Afficher sur ancien navigateur de dépôt.