diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs index 3f62e401b..6e335d1e7 100644 --- a/helix-term/src/ui/statusline.rs +++ b/helix-term/src/ui/statusline.rs @@ -407,7 +407,7 @@ where let enc = context.doc.encoding(); let config = context.editor.config(); - if config.encoding_always_show || enc != encoding::UTF_8 { + if config.statusline.toggle_encoding || enc != encoding::UTF_8 { write(context, format!(" {} ", enc.name()).into()); } } diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index f145815ba..f741369da 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -318,8 +318,6 @@ pub struct Config { pub file_picker: FilePickerConfig, /// Configuration of the statusline elements pub statusline: StatusLineConfig, - /// Toggle encoding to always show - pub encoding_always_show: bool, /// Shape for cursor in each mode pub cursor_shape: CursorShapeConfig, /// Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. Defaults to `false`. @@ -504,6 +502,7 @@ pub struct StatusLineConfig { pub mode: ModeConfig, pub diagnostics: Vec, pub workspace_diagnostics: Vec, + pub toggle_encoding: bool, } impl Default for StatusLineConfig { @@ -530,6 +529,7 @@ impl Default for StatusLineConfig { mode: ModeConfig::default(), diagnostics: vec![Severity::Warning, Severity::Error], workspace_diagnostics: vec![Severity::Warning, Severity::Error], + toggle_encoding: false, } } } @@ -998,7 +998,6 @@ impl Default for Config { auto_info: true, file_picker: FilePickerConfig::default(), statusline: StatusLineConfig::default(), - encoding_always_show: false, cursor_shape: CursorShapeConfig::default(), true_color: false, undercurl: false,