patch 9.1.0472: Inconsistencies between functions for option flags

Problem:  Inconsistencies between functions for option flags.
Solution: Consistently use "unsigned int" as return type and rename
          get_bkc_value() to get_bkc_flags() (zeertzjq).

closes: #14925

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/bufwrite.c b/src/bufwrite.c
index bf79ad5bf3fcb2f6478ff434de55ddd4ef7ab88c..c9d9875d64531e0bed52ad0d1a8165111d3990ee 100644 (file)
--- a/src/bufwrite.c
+++ b/src/bufwrite.c
@@ -690,7 +690,7 @@ buf_write(
     int                    write_undo_file = FALSE;
     context_sha256_T sha_ctx;
 #endif
-    unsigned int    bkc = get_bkc_value(buf);
+    unsigned int    bkc = get_bkc_flags(buf);
     pos_T          orig_start = buf->b_op_start;
     pos_T          orig_end = buf->b_op_end;
 

diff --git a/src/insexpand.c b/src/insexpand.c
index 7066be8f38b9b000a7428c476ff9c23cdfaa2764..19a4a217377bd6d009748ce1b3027ded965b99aa 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -1226,7 +1226,7 @@ ins_compl_build_pum(void)
     int                cur = -1;
     int                lead_len = 0;
     int                max_fuzzy_score = 0;
-    int                cur_cot_flags = get_cot_flags();
+    unsigned int cur_cot_flags = get_cot_flags();
     int                compl_no_select = (cur_cot_flags & COT_NOSELECT) != 0;
     int                compl_fuzzy_match = (cur_cot_flags & COT_FUZZY) != 0;
 
@@ -2925,7 +2925,7 @@ set_completion(colnr_T startcol, list_T *list)
     int save_w_wrow = curwin->w_wrow;
     int save_w_leftcol = curwin->w_leftcol;
     int flags = CP_ORIGINAL_TEXT;
-    int cur_cot_flags = get_cot_flags();
+    unsigned int cur_cot_flags = get_cot_flags();
     int compl_longest = (cur_cot_flags & COT_LONGEST) != 0;
     int compl_no_insert = (cur_cot_flags & COT_NOINSERT) != 0;
     int compl_no_select = (cur_cot_flags & COT_NOSELECT) != 0;
@@ -4126,7 +4126,7 @@ find_next_completion_match(
 {
     int            found_end = FALSE;
     compl_T *found_compl = NULL;
-    int            cur_cot_flags = get_cot_flags();
+    unsigned int cur_cot_flags = get_cot_flags();
     int            compl_no_select = (cur_cot_flags & COT_NOSELECT) != 0;
     int            compl_fuzzy_match = (cur_cot_flags & COT_FUZZY) != 0;
 
@@ -4246,7 +4246,7 @@ ins_compl_next(
     int            advance;
     int            started = compl_started;
     buf_T   *orig_curbuf = curbuf;
-    int            cur_cot_flags = get_cot_flags();
+    unsigned int cur_cot_flags = get_cot_flags();
     int            compl_no_insert = (cur_cot_flags & COT_NOINSERT) != 0;
     int            compl_fuzzy_match = (cur_cot_flags & COT_FUZZY) != 0;
 

diff --git a/src/option.c b/src/option.c
index 8521c6ed17b70ba6e3313b4ba2be257f0010dd41..b26c606892387e65a51671ce19cf2dd880551c9c 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -8364,10 +8364,10 @@ get_sidescrolloff_value(void)
 }
 
 /*
- * Get the local or global value of 'backupcopy'.
+ * Get the local or global value of 'backupcopy' flags.
  */
     unsigned int
-get_bkc_value(buf_T *buf)
+get_bkc_flags(buf_T *buf)
 {
     return buf->b_bkc_flags ? buf->b_bkc_flags : bkc_flags;
 }
@@ -8386,7 +8386,7 @@ get_flp_value(buf_T *buf)
 #endif
 
 /*
- * Get the local or global value of the 'virtualedit' flags.
+ * Get the local or global value of 'virtualedit' flags.
  */
     unsigned int
 get_ve_flags(void)

diff --git a/src/proto/insexpand.pro b/src/proto/insexpand.pro
index 3d8c0428e8b9016ca950165ee660cb9e03ea2ad9..6b34c0fe150c436bbe19a792df642124e86c68e6 100644 (file)
--- a/src/proto/insexpand.pro
+++ b/src/proto/insexpand.pro
@@ -27,7 +27,7 @@ int ins_compl_accept_char(int c);
 int ins_compl_add_infercase(char_u *str_arg, int len, int icase, char_u *fname, int dir, int cont_s_ipos);
 int ins_compl_has_shown_match(void);
 int ins_compl_long_shown_match(void);
-unsigned get_cot_flags(void);
+unsigned int get_cot_flags(void);
 int pum_wanted(void);
 void ins_compl_show_pum(void);
 char_u *find_word_start(char_u *ptr);

diff --git a/src/proto/option.pro b/src/proto/option.pro
index be7ee959cf936965a5c375242d31d926042e4c2d..69463d44fc4c79ec6707ead49c87236445ac958d 100644 (file)
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -139,7 +139,7 @@ int reset_option_was_set(char_u *name);
 int can_bs(int what);
 long get_scrolloff_value(void);
 long get_sidescrolloff_value(void);
-unsigned int get_bkc_value(buf_T *buf);
+unsigned int get_bkc_flags(buf_T *buf);
 char_u *get_flp_value(buf_T *buf);
 unsigned int get_ve_flags(void);
 char_u *get_showbreak_value(win_T *win);

diff --git a/src/version.c b/src/version.c
index 40186dd5000716f4a9feccaec148346de3c3209e..334ebd716c248481a6e55e0d780405c4107a4ec7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    472,
 /**/
     471,
 /**/