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 #10033)

diff --git a/src/option.h b/src/option.h
index 152956167c4f8d20d04164cdda647d21f72737e5..e34467514a5900388be725dc6f7fee1669c3421a 100644 (file)
--- 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
index 680eef1f53daaf209986a50b1d12053be1162475..921e701698513af15ed59964487e845d89ed554f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4640,
 /**/
     4639,
 /**/