diff options
| author | AdaShoelace <adashoelace@gmail.com> | 2021-06-01 09:41:33 +0200 |
|---|---|---|
| committer | AdaShoelace <adashoelace@gmail.com> | 2021-06-01 09:41:33 +0200 |
| commit | a2efc6fcac3be363acdbb92ca55ea80b424221e2 (patch) | |
| tree | 0c54b33825bf68ee1d28db341aa0503ef5b33876 | |
| parent | Omit '(unnamed)' from tab name (diff) | |
| parent | docs(changelog): Fix config options (diff) | |
| download | sl0ppij-a2efc6fcac3be363acdbb92ca55ea80b424221e2.tar.gz sl0ppij-a2efc6fcac3be363acdbb92ca55ea80b424221e2.tar.xz sl0ppij-a2efc6fcac3be363acdbb92ca55ea80b424221e2.zip | |
Merge branch 'main' of github.com:zellij-org/zellij
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | zellij-utils/src/input/options.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d72c03ed..a1a9f05d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) * Add option to start in arbitrary modes (https://github.com/zellij-org/zellij/pull/513) * Attaching to a session respects the `default_mode` setting of the client (https://github.com/zellij-org/zellij/pull/549) * Add option to specify a color theme in the config (https://github.com/zellij-org/zellij/pull/550) +* Fix config options to not depend on `simplified_ui` (https://github.com/zellij-org/zellij/pull/556) ## [0.12.1] - 2021-05-28 * HOTFIX: fix Zellij not responding to input on certain terminals (https://github.com/zellij-org/zellij/issues/538) diff --git a/zellij-utils/src/input/options.rs b/zellij-utils/src/input/options.rs index 64256976..04bca612 100644 --- a/zellij-utils/src/input/options.rs +++ b/zellij-utils/src/input/options.rs @@ -11,6 +11,7 @@ pub struct Options { /// Allow plugins to use a more simplified layout /// that is compatible with more fonts #[structopt(long)] + #[serde(default)] pub simplified_ui: bool, /// Set the default theme #[structopt(long)] |