# HG changeset patch # User Christian Brabandt # Date 1706980504 -3600 # Node ID a7354a835a785a017c59af41b062bdac5211cf61 # Parent ecd5eec5198087c40a46a4a4e9efaf236a499b05 patch 9.1.0074: did_set_breakat() should be in optionstr.c Commit: https://github.com/vim/vim/commit/eac3fdcfa0b54281c37ffb66b4d4e8d1072cca1c Author: zeertzjq Date: Sat Feb 3 18:08:09 2024 +0100 patch 9.1.0074: did_set_breakat() should be in optionstr.c Problem: did_set_breakat() should be in optionstr.c as 'breakat' is a string option. Solution: Move did_set_breakat() to optionstr.c. (zeertzjq) closes: #13958 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt diff --git a/src/option.c b/src/option.c --- a/src/option.c +++ b/src/option.c @@ -3269,27 +3269,6 @@ did_set_binary(optset_T *args) return NULL; } -#if defined(FEAT_LINEBREAK) || defined(PROTO) -/* - * Called when the 'breakat' option changes value. - */ - char * -did_set_breakat(optset_T *args UNUSED) -{ - char_u *p; - int i; - - for (i = 0; i < 256; i++) - breakat_flags[i] = FALSE; - - if (p_breakat != NULL) - for (p = p_breakat; *p; p++) - breakat_flags[*p] = TRUE; - - return NULL; -} -#endif - /* * Process the updated 'buflisted' option value. */ diff --git a/src/optionstr.c b/src/optionstr.c --- a/src/optionstr.c +++ b/src/optionstr.c @@ -1208,6 +1208,25 @@ expand_set_belloff(optexpand_T *args, in #if defined(FEAT_LINEBREAK) || defined(PROTO) /* + * The 'breakat' option is changed. + */ + char * +did_set_breakat(optset_T *args UNUSED) +{ + char_u *p; + int i; + + for (i = 0; i < 256; i++) + breakat_flags[i] = FALSE; + + if (p_breakat != NULL) + for (p = p_breakat; *p; p++) + breakat_flags[*p] = TRUE; + + return NULL; +} + +/* * The 'breakindentopt' option is changed. */ char * diff --git a/src/proto/option.pro b/src/proto/option.pro --- a/src/proto/option.pro +++ b/src/proto/option.pro @@ -29,7 +29,6 @@ char *did_set_autochdir(optset_T *args); char *did_set_ballooneval(optset_T *args); char *did_set_balloonevalterm(optset_T *args); char *did_set_binary(optset_T *args); -char *did_set_breakat(optset_T *args); char *did_set_buflisted(optset_T *args); char *did_set_cmdheight(optset_T *args); char *did_set_compatible(optset_T *args); diff --git a/src/proto/optionstr.pro b/src/proto/optionstr.pro --- a/src/proto/optionstr.pro +++ b/src/proto/optionstr.pro @@ -20,6 +20,7 @@ int expand_set_backupcopy(optexpand_T *a char *did_set_backupext_or_patchmode(optset_T *args); char *did_set_belloff(optset_T *args); int expand_set_belloff(optexpand_T *args, int *numMatches, char_u ***matches); +char *did_set_breakat(optset_T *args); char *did_set_breakindentopt(optset_T *args); int expand_set_breakindentopt(optexpand_T *args, int *numMatches, char_u ***matches); char *did_set_browsedir(optset_T *args); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 74, +/**/ 73, /**/ 72,