Merge pull request #27326 from zeertzjq/vim-9.1.0073

vim-patch:9.1.{0073,0074}
This commit is contained in:
zeertzjq 2024-02-04 07:05:03 +08:00 committed by GitHub
commit c8055c4a8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 17 deletions

View File

@ -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;
}

View File

@ -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)
{

View File

@ -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)
{