Skip to content

Commit eac3fdc

Browse files
zeertzjqchrisbra
authored andcommitted
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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 0c989e4 commit eac3fdc

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

src/option.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3269,27 +3269,6 @@ did_set_binary(optset_T *args)
32693269
return NULL;
32703270
}
32713271

3272-
#if defined(FEAT_LINEBREAK) || defined(PROTO)
3273-
/*
3274-
* Called when the 'breakat' option changes value.
3275-
*/
3276-
char *
3277-
did_set_breakat(optset_T *args UNUSED)
3278-
{
3279-
char_u *p;
3280-
int i;
3281-
3282-
for (i = 0; i < 256; i++)
3283-
breakat_flags[i] = FALSE;
3284-
3285-
if (p_breakat != NULL)
3286-
for (p = p_breakat; *p; p++)
3287-
breakat_flags[*p] = TRUE;
3288-
3289-
return NULL;
3290-
}
3291-
#endif
3292-
32933272
/*
32943273
* Process the updated 'buflisted' option value.
32953274
*/

src/optionstr.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,6 +1207,25 @@ expand_set_belloff(optexpand_T *args, int *numMatches, char_u ***matches)
12071207
}
12081208

12091209
#if defined(FEAT_LINEBREAK) || defined(PROTO)
1210+
/*
1211+
* The 'breakat' option is changed.
1212+
*/
1213+
char *
1214+
did_set_breakat(optset_T *args UNUSED)
1215+
{
1216+
char_u *p;
1217+
int i;
1218+
1219+
for (i = 0; i < 256; i++)
1220+
breakat_flags[i] = FALSE;
1221+
1222+
if (p_breakat != NULL)
1223+
for (p = p_breakat; *p; p++)
1224+
breakat_flags[*p] = TRUE;
1225+
1226+
return NULL;
1227+
}
1228+
12101229
/*
12111230
* The 'breakindentopt' option is changed.
12121231
*/

src/proto/option.pro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ char *did_set_autochdir(optset_T *args);
2929
char *did_set_ballooneval(optset_T *args);
3030
char *did_set_balloonevalterm(optset_T *args);
3131
char *did_set_binary(optset_T *args);
32-
char *did_set_breakat(optset_T *args);
3332
char *did_set_buflisted(optset_T *args);
3433
char *did_set_cmdheight(optset_T *args);
3534
char *did_set_compatible(optset_T *args);

src/proto/optionstr.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ int expand_set_backupcopy(optexpand_T *args, int *numMatches, char_u ***matches)
2020
char *did_set_backupext_or_patchmode(optset_T *args);
2121
char *did_set_belloff(optset_T *args);
2222
int expand_set_belloff(optexpand_T *args, int *numMatches, char_u ***matches);
23+
char *did_set_breakat(optset_T *args);
2324
char *did_set_breakindentopt(optset_T *args);
2425
int expand_set_breakindentopt(optexpand_T *args, int *numMatches, char_u ***matches);
2526
char *did_set_browsedir(optset_T *args);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
74,
707709
/**/
708710
73,
709711
/**/

0 commit comments

Comments
 (0)