Patch 8.2.3525
Problem: Option variable name does not match option name. (Christ van
Willigen)
Solution: Rename the variable.
Files: src/buffer.c, src/insexpand.c, src/option.c, src/optionstr.c,
src/structs.h
*** ../vim-8.2.3524/src/buffer.c 2021-10-16 15:41:25.378336694 +0100
--- src/buffer.c 2021-10-16 21:05:19.215821944 +0100
***************
*** 2364,2370 ****
#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);
#endif
#ifdef FEAT_QUICKFIX
clear_string_option(&buf->b_p_gp);
--- 2364,2370 ----
#ifdef FEAT_COMPL_FUNC
clear_string_option(&buf->b_p_cfu);
clear_string_option(&buf->b_p_ofu);
! clear_string_option(&buf->b_p_tsrfu);
#endif
#ifdef FEAT_QUICKFIX
clear_string_option(&buf->b_p_gp);
*** ../vim-8.2.3524/src/insexpand.c 2021-10-16 15:41:25.378336694 +0100
--- src/insexpand.c 2021-10-16 21:06:19.300658657 +0100
***************
*** 301,307 ****
)
: (*curbuf->b_p_tsr == NUL && *p_tsr == NUL
#ifdef FEAT_COMPL_FUNC
! && *curbuf->b_p_thsfu == NUL
#endif
))
{
--- 301,307 ----
)
: (*curbuf->b_p_tsr == NUL && *p_tsr == NUL
#ifdef FEAT_COMPL_FUNC
! && *curbuf->b_p_tsrfu == NUL
#endif
))
{
***************
*** 2246,2252 ****
case CTRL_X_OMNI:
return curbuf->b_p_ofu;
case CTRL_X_THESAURUS:
! return curbuf->b_p_thsfu;
default:
return (char_u *)"";
}
--- 2246,2252 ----
case CTRL_X_OMNI:
return curbuf->b_p_ofu;
case CTRL_X_THESAURUS:
! return curbuf->b_p_tsrfu;
default:
return (char_u *)"";
}
***************
*** 2751,2758 ****
{
#ifdef FEAT_COMPL_FUNC
return (type == CTRL_X_THESAURUS
! && curbuf->b_p_thsfu != NULL
! && *curbuf->b_p_thsfu != NUL);
#else
return FALSE;
#endif
--- 2751,2758 ----
{
#ifdef FEAT_COMPL_FUNC
return (type == CTRL_X_THESAURUS
! && curbuf->b_p_tsrfu != NULL
! && *curbuf->b_p_tsrfu != NUL);
#else
return FALSE;
#endif
*** ../vim-8.2.3524/src/option.c 2021-10-16 15:41:25.378336694 +0100
--- src/option.c 2021-10-16 21:06:37.240908616 +0100
***************
*** 5433,5439 ****
#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);
#endif
#ifdef FEAT_EVAL
case PV_TFU: return (char_u *)&(curbuf->b_p_tfu);
--- 5433,5439 ----
#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_tsrfu);
#endif
#ifdef FEAT_EVAL
case PV_TFU: return (char_u *)&(curbuf->b_p_tfu);
***************
*** 5936,5942 ****
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);
COPY_OPT_SCTX(buf, BV_THSFU);
#endif
#ifdef FEAT_EVAL
--- 5936,5942 ----
COPY_OPT_SCTX(buf, BV_CFU);
buf->b_p_ofu = vim_strsave(p_ofu);
COPY_OPT_SCTX(buf, BV_OFU);
! buf->b_p_tsrfu = vim_strsave(p_thsfu);
COPY_OPT_SCTX(buf, BV_THSFU);
#endif
#ifdef FEAT_EVAL
*** ../vim-8.2.3524/src/optionstr.c 2021-10-16 20:52:01.772842109 +0100
--- src/optionstr.c 2021-10-16 21:06:43.236992172 +0100
***************
*** 271,277 ****
#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);
#endif
#ifdef FEAT_EVAL
check_string_option(&buf->b_p_tfu);
--- 271,277 ----
#ifdef FEAT_COMPL_FUNC
check_string_option(&buf->b_p_cfu);
check_string_option(&buf->b_p_ofu);
! check_string_option(&buf->b_p_tsrfu);
#endif
#ifdef FEAT_EVAL
check_string_option(&buf->b_p_tfu);
*** ../vim-8.2.3524/src/structs.h 2021-10-16 15:41:25.378336694 +0100
--- src/structs.h 2021-10-16 21:07:00.929238750 +0100
***************
*** 2864,2870 ****
#ifdef FEAT_COMPL_FUNC
char_u *b_p_cfu; // 'completefunc'
char_u *b_p_ofu; // 'omnifunc'
! char_u *b_p_thsfu; // 'thesaurusfunc'
#endif
#ifdef FEAT_EVAL
char_u *b_p_tfu; // 'tagfunc'
--- 2864,2870 ----
#ifdef FEAT_COMPL_FUNC
char_u *b_p_cfu; // 'completefunc'
char_u *b_p_ofu; // 'omnifunc'
! char_u *b_p_tsrfu; // 'thesaurusfunc'
#endif
#ifdef FEAT_EVAL
char_u *b_p_tfu; // 'tagfunc'
*** ../vim-8.2.3524/src/version.c 2021-10-16 20:52:01.772842109 +0100
--- src/version.c 2021-10-16 21:03:36.226389568 +0100
***************
*** 759,760 ****
--- 759,762 ----
{ /* Add new patch number below this line */
+ /**/
+ 3525,
/**/
--
hundred-and-one symptoms of being an internet addict:
172. You join listservers just for the extra e-mail.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20211016201440.2AC11C80053%40moolenaar.net.
