summaryrefslogtreecommitdiffstats
path: root/alacritty_terminal/src/config/mod.rs
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2020-03-01 04:07:36 +0000
committerGitHub <noreply@github.com>2020-03-01 07:07:36 +0300
commit8c6422458299496f6fa2a6984c93bd05b55c1888 (patch)
tree20197a827cbe8b06bd9f6d45be102fc2d8821a3e /alacritty_terminal/src/config/mod.rs
parentbea6ece3f6e4f116e9f0319b6d0002943f28e3b8 (diff)
Remove `tabspaces` config option
This completely removes the tabspaces option from the Alacritty configuration, due to frequent misuse of it. Based on some research, none of the terminal emulators support setting the value for tabspaces or read the terminfo to determine init_tabs value at startup. The tested terminal emulators were URxvt, XTerm, and Termite.
Diffstat (limited to 'alacritty_terminal/src/config/mod.rs')
-rw-r--r--alacritty_terminal/src/config/mod.rs21
1 files changed, 4 insertions, 17 deletions
diff --git a/alacritty_terminal/src/config/mod.rs b/alacritty_terminal/src/config/mod.rs
index fd049af0..da95391c 100644
--- a/alacritty_terminal/src/config/mod.rs
+++ b/alacritty_terminal/src/config/mod.rs
@@ -96,10 +96,6 @@ pub struct Config<T> {
#[serde(default, deserialize_with = "failure_default")]
live_config_reload: DefaultTrueBool,
- /// Number of spaces in one tab
- #[serde(default, deserialize_with = "failure_default")]
- tabspaces: Tabspaces,
-
/// How much scrolling history to keep
#[serde(default, deserialize_with = "failure_default")]
pub scrolling: Scrolling,
@@ -133,6 +129,10 @@ pub struct Config<T> {
#[serde(skip)]
pub hold: bool,
+ // TODO: REMOVED
+ #[serde(default, deserialize_with = "failure_default")]
+ pub tabspaces: Option<usize>,
+
// TODO: DEPRECATED
#[serde(default, deserialize_with = "failure_default")]
pub render_timer: Option<bool>,
@@ -143,10 +143,6 @@ pub struct Config<T> {
}
impl<T> Config<T> {
- pub fn tabspaces(&self) -> usize {
- self.tabspaces.0
- }
-
#[inline]
pub fn draw_bold_text_with_bright_colors(&self) -> bool {
self.draw_bold_text_with_bright_colors
@@ -328,15 +324,6 @@ impl<'a> Deserialize<'a> for Alpha {
}
#[derive(Deserialize, Copy, Clone, Debug, PartialEq, Eq)]
-struct Tabspaces(usize);
-
-impl Default for Tabspaces {
- fn default() -> Self {
- Tabspaces(8)
- }
-}
-
-#[derive(Deserialize, Copy, Clone, Debug, PartialEq, Eq)]
struct DefaultTrueBool(bool);
impl Default for DefaultTrueBool {