neovim

commit c8055c4a8daeeaff8f365361f63fedb858b64341
parent c559ab0ae6bebd565862dd28b39947a07766846d
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sun,  4 Feb 2024 07:05:03 +0800

Merge pull request #27326 from zeertzjq/vim-9.1.0073

vim-patch:9.1.{0073,0074}
Diffstat:
M
src/nvim/keycodes.c
 | 
2
+-
M
src/nvim/option.c
 | 
16
----------------
M
src/nvim/optionstr.c
 | 
16
++++++++++++++++

3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/nvim/keycodes.c b/src/nvim/keycodes.c
@@ -400,7 +400,7 @@ int name_to_mod_mask(int c)
 int simplify_key(const int key, int *modifiers)
   FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
 {
-  if (!(*modifiers & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT))) {
+  if (!(*modifiers & (MOD_MASK_SHIFT | MOD_MASK_CTRL))) {
     return key;
   }
 
diff --git a/src/nvim/option.c b/src/nvim/option.c
@@ -2006,22 +2006,6 @@ static const char *did_set_binary(optset_T *args)
   return NULL;
 }
 
-/// Called when the 'breakat' option changes value.
-static const char *did_set_breakat(optset_T *args FUNC_ATTR_UNUSED)
-{
-  for (int i = 0; i < 256; i++) {
-    breakat_flags[i] = false;
-  }
-
-  if (p_breakat != NULL) {
-    for (char *p = p_breakat; *p; p++) {
-      breakat_flags[(uint8_t)(*p)] = true;
-    }
-  }
-
-  return NULL;
-}
-
 /// Process the updated 'buflisted' option value.
 static const char *did_set_buflisted(optset_T *args)
 {
diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c
@@ -797,6 +797,22 @@ int expand_set_belloff(optexpand_T *args, int *numMatches, char ***matches)
                                matches);
 }
 
+/// The 'breakat' option is changed.
+const char *did_set_breakat(optset_T *args FUNC_ATTR_UNUSED)
+{
+  for (int i = 0; i < 256; i++) {
+    breakat_flags[i] = false;
+  }
+
+  if (p_breakat != NULL) {
+    for (char *p = p_breakat; *p; p++) {
+      breakat_flags[(uint8_t)(*p)] = true;
+    }
+  }
+
+  return NULL;
+}
+
 /// The 'breakindentopt' option is changed.
 const char *did_set_breakindentopt(optset_T *args)
 {