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

Patch 9.0.1639 (after 9.0.1638)
Problem:    Build failure without the crypt feature.
Solution:   Adjust #ifdefs
Files:      src/fileio.c


*** ../vim-9.0.1638/src/fileio.c	2023-06-17 15:00:19.934646967 +0100
--- src/fileio.c	2023-06-17 15:14:07.685688674 +0100
***************
*** 218,224 ****
--- 218,226 ----
      int		using_b_ffname;
      int		using_b_fname;
      static char *msg_is_a_directory = N_("is a directory");
+ #ifdef FEAT_CRYPT
      int		eof = FALSE;
+ #endif
  #ifdef FEAT_SODIUM
      int		may_need_lseek = FALSE;
  #endif
***************
*** 1276,1285 ****
  				if (!curbuf->b_p_eol)
  				    --tlen;
  				size = tlen;
  				eof = TRUE;
  				break;
  			    }
- 
  			}
  		    }
  		}
--- 1278,1288 ----
  				if (!curbuf->b_p_eol)
  				    --tlen;
  				size = tlen;
+ #ifdef FEAT_CRYPT
  				eof = TRUE;
+ #endif
  				break;
  			    }
  			}
  		    }
  		}
***************
*** 1288,1294 ****
  		    /*
  		     * Read bytes from the file.
  		     */
! # ifdef FEAT_SODIUM
  		    // Let the crypt layer work with a buffer size of 8192
  		    //
  		    // Sodium encryption requires a fixed block size to
--- 1291,1297 ----
  		    /*
  		     * Read bytes from the file.
  		     */
! #ifdef FEAT_SODIUM
  		    // Let the crypt layer work with a buffer size of 8192
  		    //
  		    // Sodium encryption requires a fixed block size to
***************
*** 1327,1338 ****
  			    may_need_lseek = FALSE;
  			}
  		    }
! # endif
  		    long read_size = size;
  		    size = read_eintr(fd, ptr, read_size);
  		    filesize_count += size;
  		    // hit end of file
  		    eof = (size < read_size || filesize_count == filesize_disk);
  		}
  
  #ifdef FEAT_CRYPT
--- 1330,1343 ----
  			    may_need_lseek = FALSE;
  			}
  		    }
! #endif
  		    long read_size = size;
  		    size = read_eintr(fd, ptr, read_size);
  		    filesize_count += size;
+ #ifdef FEAT_CRYPT
  		    // hit end of file
  		    eof = (size < read_size || filesize_count == filesize_disk);
+ #endif
  		}
  
  #ifdef FEAT_CRYPT
*** ../vim-9.0.1638/src/version.c	2023-06-17 15:00:19.934646967 +0100
--- src/version.c	2023-06-17 15:34:14.973281749 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1639,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
189. You put your e-mail address in the upper left-hand corner of envelopes.

 /// 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    ///