To: vim_dev@googlegroups.com
Subject: Patch 8.2.3498
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.3498
Problem:    Recover test may fail on some systems.
Solution:   Adjust the little endian and 64 bit detection. (James McCoy,
            closes #8941)
Files:      src/testdir/test_recover.vim


*** ../vim-8.2.3497/src/testdir/test_recover.vim	2021-09-14 21:58:20.431707376 +0100
--- src/testdir/test_recover.vim	2021-10-11 20:42:04.854786907 +0100
***************
*** 208,216 ****
    " Not all fields are written in a system-independent manner.  Detect whether
    " the test is running on a little or big-endian system, so the correct
    " corruption values can be set.
!   let little_endian = b[1008:1011] == 0z33323130
!   " The swap file header fields can be either 32-bit or 64-bit.
!   let system_64bit = b[1012:1015] == 0z00000000
  
    " clear the B0_MAGIC_LONG field
    if system_64bit
--- 208,218 ----
    " Not all fields are written in a system-independent manner.  Detect whether
    " the test is running on a little or big-endian system, so the correct
    " corruption values can be set.
!   " The B0_MAGIC_LONG field may be 32-bit or 64-bit, depending on the system,
!   " even though the value stored is only 32-bits.  Therefore, need to check
!   " both the high and low 32-bits to compute these values.
!   let little_endian = (b[1008:1011] == 0z33323130) || (b[1012:1015] == 0z33323130)
!   let system_64bit = little_endian ? (b[1012:1015] == 0z00000000) : (b[1008:1011] == 0z00000000)
  
    " clear the B0_MAGIC_LONG field
    if system_64bit
*** ../vim-8.2.3497/src/version.c	2021-10-11 20:26:43.981512015 +0100
--- src/version.c	2021-10-11 20:46:39.855048684 +0100
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     3498,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
132. You come back and check this list every half-hour.

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