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.

diff --git a/src/buffer.c b/src/buffer.c
index ba20a611d1aba464b1b4f0f9195f4322f0126891..a3f84c748c8e4a194ac2ced7d3756fb10ae8160c 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2364,7 +2364,7 @@ free_buf_options(
 #ifdef FEAT_COMPL_FUNC
     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);
 #endif
 #ifdef FEAT_QUICKFIX
     clear_string_option(&buf->b_p_gp);

diff --git a/src/insexpand.c b/src/insexpand.c
index 624146a3f1b22057ebc096ff504214ef175cfffb..bcaa3fdf54ad6c97492030153a64b7fde536576b 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -301,7 +301,7 @@ has_compl_option(int dict_opt)
                                                        )
                 : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL
 #ifdef FEAT_COMPL_FUNC
-                    && *curbuf->b_p_thsfu == NUL
+                    && *curbuf->b_p_tsrfu == NUL
 #endif
                   ))
     {
@@ -2246,7 +2246,7 @@ 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 *)"";
     }
@@ -2751,8 +2751,8 @@ thesaurus_func_complete(int type UNUSED)
 {
 #ifdef FEAT_COMPL_FUNC
     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);
 #else
     return FALSE;
 #endif

diff --git a/src/option.c b/src/option.c
index 385126eb3d676e0f16ef790f828231e410a8bda2..7d86ccf14dd605bbebbc83762b44b3ab59354d06 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -5433,7 +5433,7 @@ get_varp(struct vimoption *p)
 #ifdef FEAT_COMPL_FUNC
        case PV_CFU:    return (char_u *)&(curbuf->b_p_cfu);
        case PV_OFU:    return (char_u *)&(curbuf->b_p_ofu);
-       case PV_THSFU:  return (char_u *)&(curbuf->b_p_thsfu);
+       case PV_THSFU:  return (char_u *)&(curbuf->b_p_tsrfu);
 #endif
 #ifdef FEAT_EVAL
        case PV_TFU:    return (char_u *)&(curbuf->b_p_tfu);
@@ -5936,7 +5936,7 @@ buf_copy_options(buf_T *buf, int flags)
            COPY_OPT_SCTX(buf, BV_CFU);
            buf->b_p_ofu = vim_strsave(p_ofu);
            COPY_OPT_SCTX(buf, BV_OFU);
-           buf->b_p_thsfu = vim_strsave(p_thsfu);
+           buf->b_p_tsrfu = vim_strsave(p_thsfu);
            COPY_OPT_SCTX(buf, BV_THSFU);
 #endif
 #ifdef FEAT_EVAL

diff --git a/src/optionstr.c b/src/optionstr.c
index bced92d6dd0a80c1470d06fa807f7b5998c2d689..7f2b04ddc4b967a6b14731a7089eaf58c86bf3ec 100644 (file)
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -271,7 +271,7 @@ check_buf_options(buf_T *buf)
 #ifdef FEAT_COMPL_FUNC
     check_string_option(&buf->b_p_cfu);
     check_string_option(&buf->b_p_ofu);
-    check_string_option(&buf->b_p_thsfu);
+    check_string_option(&buf->b_p_tsrfu);
 #endif
 #ifdef FEAT_EVAL
     check_string_option(&buf->b_p_tfu);

diff --git a/src/structs.h b/src/structs.h
index 021206e1ee6b836b132fe86099081e88074598f7..bd468a9e7a4033ad121048bd9cf7190c9239333c 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -2864,7 +2864,7 @@ struct file_buffer
 #ifdef FEAT_COMPL_FUNC
     char_u     *b_p_cfu;       // 'completefunc'
     char_u     *b_p_ofu;       // 'omnifunc'
-    char_u     *b_p_thsfu;     // 'thesaurusfunc'
+    char_u     *b_p_tsrfu;     // 'thesaurusfunc'
 #endif
 #ifdef FEAT_EVAL
     char_u     *b_p_tfu;       // 'tagfunc'

diff --git a/src/version.c b/src/version.c
index 16ba2cfb6d2c89aa935ba3cb831baf3be581c6a2..ba4a99028d2353a1854a59cd4cb7c5487be4936c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3525,
 /**/
     3524,
 /**/