diff options
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | config.c | 25 | ||||
| -rw-r--r-- | input.c | 2 | ||||
| -rw-r--r-- | key-binding.h | 2 |
4 files changed, 6 insertions, 31 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c41c59b9..e0f6b8e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -109,9 +109,13 @@ ### Deprecated ### Removed -* `[colors]` and `[colors2]` config sections. These were deprecated in - 1.26.0, and were replaced by `[colors-dark]` and `[colors-light]`. +* `[colors]` and `[colors2]` config sections, and the corresponding + `color-theme-switch-1` and `color-theme-switch-2` key + bindings. + These were deprecated in 1.26.0, and were replaced by + `[colors-dark]`, `[colors-light]`, `color-theme-switch-dark` and + `color-theme-switch-light`. ### Fixed @@ -183,8 +183,6 @@ static const char *const binding_action_map[] = { [BIND_ACTION_QUIT] = "quit", [BIND_ACTION_REGEX_LAUNCH] = "regex-launch", [BIND_ACTION_REGEX_COPY] = "regex-copy", - [BIND_ACTION_THEME_SWITCH_1] = "color-theme-switch-1", - [BIND_ACTION_THEME_SWITCH_2] = "color-theme-switch-2", [BIND_ACTION_THEME_SWITCH_DARK] = "color-theme-switch-dark", [BIND_ACTION_THEME_SWITCH_LIGHT] = "color-theme-switch-light", [BIND_ACTION_THEME_TOGGLE] = "color-theme-toggle", @@ -2409,29 +2407,6 @@ parse_key_binding_section(struct context *ctx, aux.regex_name = regex_name; } - if (action_map == binding_action_map && - action >= BIND_ACTION_THEME_SWITCH_1 && - action <= BIND_ACTION_THEME_SWITCH_2) - { - const char *use_instead = - action_map[action == BIND_ACTION_THEME_SWITCH_1 - ? BIND_ACTION_THEME_SWITCH_DARK - : BIND_ACTION_THEME_SWITCH_LIGHT]; - - const char *notif = action == BIND_ACTION_THEME_SWITCH_1 - ? "[key-bindings].color-theme-switch-1: use [key-bindings].color-theme-switch-dark instead" - : "[key-bindings].color-theme-switch-2: use [key-bindings].color-theme-switch-light instead"; - - LOG_WARN("%s:%d: [key-bindings].%s: deprecated, use %s instead", - ctx->path, ctx->lineno, - action_map[action], use_instead); - - user_notification_add( - &ctx->conf->notifications, - USER_NOTIFICATION_DEPRECATED, - xstrdup(notif)); - } - if (!value_to_key_combos(ctx, action, &aux, bindings, KEY_BINDING)) { free_binding_aux(&aux); return false; @@ -493,12 +493,10 @@ execute_binding(struct seat *seat, struct terminal *term, return true; - case BIND_ACTION_THEME_SWITCH_1: case BIND_ACTION_THEME_SWITCH_DARK: term_theme_switch_to_dark(term); return true; - case BIND_ACTION_THEME_SWITCH_2: case BIND_ACTION_THEME_SWITCH_LIGHT: term_theme_switch_to_light(term); return true; diff --git a/key-binding.h b/key-binding.h index c4a04e99..4d40a664 100644 --- a/key-binding.h +++ b/key-binding.h @@ -43,8 +43,6 @@ enum bind_action_normal { BIND_ACTION_QUIT, BIND_ACTION_REGEX_LAUNCH, BIND_ACTION_REGEX_COPY, - BIND_ACTION_THEME_SWITCH_1, - BIND_ACTION_THEME_SWITCH_2, BIND_ACTION_THEME_SWITCH_DARK, BIND_ACTION_THEME_SWITCH_LIGHT, BIND_ACTION_THEME_TOGGLE, |
