To: vim_dev@googlegroups.com
Subject: Patch 8.2.2054
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2054
Problem:    Amiga: FEAT_ARP defined when it should not.
Solution:   Adjust "||" to "&&" in #ifdef. (Ola Söder, closes #7375)
Files:      src/feature.h


*** ../vim-8.2.2053/src/feature.h	2020-11-25 15:45:34.590936520 +0100
--- src/feature.h	2020-11-25 21:53:11.744037644 +0100
***************
*** 1090,1096 ****
   * +ARP			Amiga only. Use arp.library, DOS 2.0 is not required.
   */
  #if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \
! 	&& !defined(__MORPHOS__) || !defined(__AROS__)
  # define FEAT_ARP
  #endif
  
--- 1090,1096 ----
   * +ARP			Amiga only. Use arp.library, DOS 2.0 is not required.
   */
  #if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \
! 	&& !defined(__MORPHOS__) && !defined(__AROS__)
  # define FEAT_ARP
  #endif
  
*** ../vim-8.2.2053/src/version.c	2020-11-25 21:30:07.086109185 +0100
--- src/version.c	2020-11-25 21:54:17.735739944 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2054,
  /**/

-- 
GUARD #2:  Wait a minute -- supposing two swallows carried it together?
GUARD #1:  No, they'd have to have it on a line.
GUARD #2:  Well, simple!  They'd just use a standard creeper!
GUARD #1:  What, held under the dorsal guiding feathers?
GUARD #2:  Well, why not?
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///