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 <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/option.c b/src/option.c
index 92ed1ec2a5f611bb06576a48818884a806a12eea..f0e77270a49375fe7573f3a28194727dbed1f31a 100644 (file)
--- 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 2d809a394378e55e76b501fe4bcf37d6f8850593..c049b3b6fc9aae559f739957ea2b95c54f65673e 100644 (file)
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1207,6 +1207,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.
  */

diff --git a/src/proto/option.pro b/src/proto/option.pro
index effa81315b176919953d7721c20e7f79fcd865f7..be7ee959cf936965a5c375242d31d926042e4c2d 100644 (file)
--- 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 cfd1982d108bd01a57698a378beec57c489afc21..340ffc428a021e6290e15f847158daa1d90c548c 100644 (file)
--- 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 0dfa2d8e327accf282fb5b8bf8103fcc636e613f..7dca96a6b0441d7d9355c5559b5b0decda75302d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    74,
 /**/
     73,
 /**/