vim-patch:8.2.3525: option variable name does not match option name

Problem: Option variable name does not match option name. (Christ van Willigen) Solution: Rename the variable. vim/vim@d4c4bfa
Shougo · Nov 15, 2021 · 3678f04 · 3678f04
1 parent f878b49
commit 3678f04
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
@@ -1925,7 +1925,7 @@ void free_buf_options(buf_T *buf, int free_p_ff)
   clear_string_option(&buf->b_p_cpt);
   clear_string_option(&buf->b_p_cfu);
   clear_string_option(&buf->b_p_ofu);
-  clear_string_option(&buf->b_p_thsfu);
+  clear_string_option(&buf->b_p_tsrfu);
   clear_string_option(&buf->b_p_gp);
   clear_string_option(&buf->b_p_mp);
   clear_string_option(&buf->b_p_efm);

diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
@@ -697,7 +697,7 @@ struct file_buffer {
 #endif
   char_u *b_p_cfu;              ///< 'completefunc'
   char_u *b_p_ofu;              ///< 'omnifunc'
-  char_u *b_p_thsfu;            ///< 'thesaurusfunc'
+  char_u *b_p_tsrfu;            ///< 'thesaurusfunc'
   char_u *b_p_tfu;              ///< 'tagfunc'
   int b_p_eol;                  ///< 'endofline'
   int b_p_fixeol;               ///< 'fixendofline'

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
@@ -2071,7 +2071,7 @@ static bool check_compl_option(bool dict_opt)
 {
   if (dict_opt
       ? (*curbuf->b_p_dict == NUL && *p_dict == NUL && !curwin->w_p_spell)
-      : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL && *curbuf->b_p_thsfu == NUL)) {
+      : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL && *curbuf->b_p_tsrfu == NUL)) {
     ctrl_x_mode = CTRL_X_NORMAL;
     edit_submode = NULL;
     msg_attr((dict_opt
@@ -3930,7 +3930,7 @@ static char_u *get_complete_funcname(int type) {
   case CTRL_X_OMNI:
     return curbuf->b_p_ofu;
   case CTRL_X_THESAURUS:
-    return curbuf->b_p_thsfu;
+    return curbuf->b_p_tsrfu;
   default:
     return (char_u *)"";
   }
@@ -4115,8 +4115,8 @@ int ins_compl_add_tv(typval_T *const tv, const Direction dir, bool fast)
 static int thesaurus_func_complete(int type)
 {
   return (type == CTRL_X_THESAURUS
-          && curbuf->b_p_thsfu != NULL
-          && *curbuf->b_p_thsfu != NUL);
+          && curbuf->b_p_tsrfu != NULL
+          && *curbuf->b_p_tsrfu != NUL);
 }
 
 // Get the next expansion(s), using "compl_pattern".

diff --git a/src/nvim/option.c b/src/nvim/option.c
@@ -5915,7 +5915,7 @@ static char_u *get_varp(vimoption_T *p)
     return (char_u *)&(curbuf->b_p_sw);
   case PV_TFU:
     return (char_u *)&(curbuf->b_p_tfu);
-  case PV_THSFU:
+  case PV_TSRFU:
     return (char_u *)&(curbuf->b_p_thsfu);
   case PV_TS:
     return (char_u *)&(curbuf->b_p_ts);