summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-02-03 18:08:09 +0100
committerChristian Brabandt <cb@256bit.org>2024-02-03 18:08:09 +0100
commiteac3fdcfa0b54281c37ffb66b4d4e8d1072cca1c (patch)
tree5cae81a11d47036ff5759494686d3aee646eb331
parent0c989e4a3ae50085aa8c6bed5d6701760191bc1d (diff)
patch 9.1.0074: did_set_breakat() should be in optionstr.cv9.1.0074
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 <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/option.c21
-rw-r--r--src/optionstr.c19
-rw-r--r--src/proto/option.pro1
-rw-r--r--src/proto/optionstr.pro1
-rw-r--r--src/version.c2
5 files changed, 22 insertions, 22 deletions
diff --git a/src/option.c b/src/option.c
index 92ed1ec2a5..f0e77270a4 100644
--- 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
index 2d809a3943..c049b3b6fc 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1208,6 +1208,25 @@ expand_set_belloff(optexpand_T *args, int *numMatches, char_u ***matches)
#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
index effa81315b..be7ee959cf 100644
--- 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
index cfd1982d10..340ffc428a 100644
--- a/src/proto/optionstr.pro
+++ b/src/proto/optionstr.pro
@@ -20,6 +20,7 @@ int expand_set_backupcopy(optexpand_T *args, int *numMatches, char_u ***matches)
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
index 0dfa2d8e32..7dca96a6b0 100644
--- 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,