# HG changeset patch # User Bram Moolenaar # Date 1648465204 -7200 # Node ID fadcfddcebf458a8ae3c57bbcc11f8b69d2b0fa4 # Parent 89c181c99e23c18ca55ec868365e43ca798ff8c7 patch 8.2.4640: some boolean options use "long" instead of "int" Commit: https://github.com/vim/vim/commit/8be423b7ac3b5742deb20a7eba8f5c9680c04500 Author: James McCoy Date: Mon Mar 28 11:55:12 2022 +0100 patch 8.2.4640: some boolean options use "long" instead of "int" Problem: Some boolean options use "long" instead of "int". Solution: Adjust the type. (James McCoy, closes https://github.com/vim/vim/issues/10033) diff --git a/src/option.h b/src/option.h --- a/src/option.h +++ b/src/option.h @@ -570,7 +570,7 @@ EXTERN char_u *p_fenc; // 'fileencoding' EXTERN char_u *p_fencs; // 'fileencodings' EXTERN char_u *p_ff; // 'fileformat' EXTERN char_u *p_ffs; // 'fileformats' -EXTERN long p_fic; // 'fileignorecase' +EXTERN int p_fic; // 'fileignorecase' EXTERN char_u *p_ft; // 'filetype' EXTERN char_u *p_fcs; // 'fillchar' EXTERN int p_fixeol; // 'fixendofline' @@ -750,7 +750,7 @@ EXTERN long p_mis; // 'menuitems' EXTERN char_u *p_msm; // 'mkspellmem' #endif EXTERN int p_ml; // 'modeline' -EXTERN long p_mle; // 'modelineexpr' +EXTERN int p_mle; // 'modelineexpr' EXTERN long p_mls; // 'modelines' EXTERN int p_ma; // 'modifiable' EXTERN int p_mod; // 'modified' @@ -1078,7 +1078,7 @@ EXTERN int p_wiv; // 'weirdinvert' EXTERN char_u *p_ww; // 'whichwrap' EXTERN long p_wc; // 'wildchar' EXTERN long p_wcm; // 'wildcharm' -EXTERN long p_wic; // 'wildignorecase' +EXTERN int p_wic; // 'wildignorecase' EXTERN char_u *p_wim; // 'wildmode' #ifdef FEAT_WILDMENU EXTERN int p_wmnu; // 'wildmenu' diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 4640, +/**/ 4639, /**/ 4638,