summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md4
-rw-r--r--default-plugins/compact-bar/src/line.rs2
-rw-r--r--default-plugins/tab-bar/src/line.rs2
-rw-r--r--docs/TERMINOLOGY.md2
-rw-r--r--zellij-client/src/lib.rs2
-rw-r--r--zellij-server/src/logging_pipe.rs2
-rw-r--r--zellij-server/src/os_input_output.rs2
-rw-r--r--zellij-server/src/panes/grid.rs2
-rw-r--r--zellij-server/src/tab/mod.rs12
-rw-r--r--zellij-utils/src/envs.rs2
-rw-r--r--zellij-utils/src/input/actions.rs2
-rw-r--r--zellij-utils/src/input/layout.rs2
-rw-r--r--zellij-utils/src/input/options.rs4
-rw-r--r--zellij-utils/src/input/plugins.rs4
14 files changed, 22 insertions, 22 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0898aef29..710c18422 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -174,7 +174,7 @@ that loads the `compact-bar`. (https://github.com/zellij-org/zellij/pull/1450)
* Fix: handle pasted text properly in windows terminal (https://github.com/zellij-org/zellij/pull/917)
* Fix: update example config options (https://github.com/zellij-org/zellij/pull/920)
* Fix: correct handling of unbinds (https://github.com/zellij-org/zellij/issues/923)
-* Fix: improve perfomance when resizing window with a large scrollback buffer (https://github.com/zellij-org/zellij/pull/895)
+* Fix: improve performance when resizing window with a large scrollback buffer (https://github.com/zellij-org/zellij/pull/895)
* Fix: support multiple users in plugins (https://github.com/zellij-org/zellij/pull/930)
* Fix: update default layouts (https://github.com/zellij-org/zellij/pull/926)
* Add: infrastructure to show distinct tips in the `status-bar` plugin (https://github.com/zellij-org/zellij/pull/926)
@@ -183,7 +183,7 @@ that loads the `compact-bar`. (https://github.com/zellij-org/zellij/pull/1450)
## [0.21.0] - 2021-11-29
* Add: initial preparations for overlay's (https://github.com/zellij-org/zellij/pull/871)
* Add: initial `zellij.desktop` file (https://github.com/zellij-org/zellij/pull/870)
-* Add: section for third party repositiories `THIRD_PARTY_INSTALL.md` (https://github.com/zellij-org/zellij/pull/857)
+* Add: section for third party repositories `THIRD_PARTY_INSTALL.md` (https://github.com/zellij-org/zellij/pull/857)
* Add: suggestion for similar session name, on attach (https://github.com/zellij-org/zellij/pull/843)
* Fix: handling and overwriting options through the cli (https://github.com/zellij-org/zellij/pull/859)
diff --git a/default-plugins/compact-bar/src/line.rs b/default-plugins/compact-bar/src/line.rs
index 077dbbd10..675f46a9f 100644
--- a/default-plugins/compact-bar/src/line.rs
+++ b/default-plugins/compact-bar/src/line.rs
@@ -68,7 +68,7 @@ fn populate_tabs_in_tab_line(
let left_fits = size_by_adding_left <= cols;
let right_fits = size_by_adding_right <= cols;
// active tab is kept in the middle by adding to the side that
- // has less width, or if the tab on the other side doesn' fit
+ // has less width, or if the tab on the other side doesn't fit
if (total_left <= total_right || !right_fits) && left_fits {
// add left tab
let tab = tabs_before_active.pop().unwrap();
diff --git a/default-plugins/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs
index 51af1474b..8341f142f 100644
--- a/default-plugins/tab-bar/src/line.rs
+++ b/default-plugins/tab-bar/src/line.rs
@@ -68,7 +68,7 @@ fn populate_tabs_in_tab_line(
let left_fits = size_by_adding_left <= cols;
let right_fits = size_by_adding_right <= cols;
// active tab is kept in the middle by adding to the side that
- // has less width, or if the tab on the other side doesn' fit
+ // has less width, or if the tab on the other side doesn't fit
if (total_left <= total_right || !right_fits) && left_fits {
// add left tab
let tab = tabs_before_active.pop().unwrap();
diff --git a/docs/TERMINOLOGY.md b/docs/TERMINOLOGY.md
index e34fc8039..a4f2bcaa6 100644
--- a/docs/TERMINOLOGY.md
+++ b/docs/TERMINOLOGY.md
@@ -11,7 +11,7 @@ Part of the ANSI/VT specification that includes instructions for the terminal em
Part of the ANSI/VT specification that includes instructions for the underlying operating system (eg. change window title).
## pty
-A pty (pseudoterminal) is a character device that emulates a traditional terminal. It is a pair of processes (traditionally given culturally incensitive names, here they will be refered to as primary/secondary).
+A pty (pseudoterminal) is a character device that emulates a traditional terminal. It is a pair of processes (traditionally given culturally incensitive names, here they will be referred to as primary/secondary).
The primary part is the part connected to the terminal emulator. The emulator listens to this part of the channel, reads instructions from it that it uses in order to draw characters on the screen.
The secondary part is used by the program running inside the terminal (eg. the shell) in order to send those instructions.
diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs
index 5ddaa5fee..4d7c3978c 100644
--- a/zellij-client/src/lib.rs
+++ b/zellij-client/src/lib.rs
@@ -202,7 +202,7 @@ pub fn start_client(
let send_client_instructions = send_client_instructions.clone();
let os_input = os_input.clone();
Box::new(move |info| {
- error!("Panic occured in client:\n{:?}", info);
+ error!("Panic occurred in client:\n{:?}", info);
if let Ok(()) = os_input.unset_raw_mode(0) {
handle_panic(info, &send_client_instructions);
}
diff --git a/zellij-server/src/logging_pipe.rs b/zellij-server/src/logging_pipe.rs
index 048c9b3fd..085a672fd 100644
--- a/zellij-server/src/logging_pipe.rs
+++ b/zellij-server/src/logging_pipe.rs
@@ -54,7 +54,7 @@ impl Write for LoggingPipe {
if self.buffer.len() + buf.len() > ZELLIJ_MAX_PIPE_BUFFER_SIZE {
let error_msg =
"Exceeded log buffer size. Make sure that your plugin calls flush on stderr on \
- valid UTF-8 symbol boundary. Aditionally, make sure that your log message contains \
+ valid UTF-8 symbol boundary. Additionally, make sure that your log message contains \
endline \\n symbol.";
error!("{}: {}", self.plugin_name, error_msg);
self.buffer.clear();
diff --git a/zellij-server/src/os_input_output.rs b/zellij-server/src/os_input_output.rs
index b757ad460..0a3e00d54 100644
--- a/zellij-server/src/os_input_output.rs
+++ b/zellij-server/src/os_input_output.rs
@@ -271,7 +271,7 @@ pub trait ServerOsApi: Send + Sync {
/// Sets the size of the terminal associated to file descriptor `fd`.
fn set_terminal_size_using_fd(&self, fd: RawFd, cols: u16, rows: u16);
/// Spawn a new terminal, with a terminal action. The returned tuple contains the master file
- /// descriptor of the forked psuedo terminal and a [ChildId] struct containing process id's for
+ /// descriptor of the forked pseudo terminal and a [ChildId] struct containing process id's for
/// the forked child process.
fn spawn_terminal(
&self,
diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs
index ce7c71577..ef8d2e43c 100644
--- a/zellij-server/src/panes/grid.rs
+++ b/zellij-server/src/panes/grid.rs
@@ -495,7 +495,7 @@ impl Grid {
}
cursor_canonical_line_index
}
- // TODO: merge these two funtions
+ // TODO: merge these two functions
fn cursor_index_in_canonical_line(&self) -> usize {
let mut cursor_canonical_line_index = 0;
let mut cursor_index_in_canonical_line = 0;
diff --git a/zellij-server/src/tab/mod.rs b/zellij-server/src/tab/mod.rs
index c6ebf0b2d..7dd19c251 100644
--- a/zellij-server/src/tab/mod.rs
+++ b/zellij-server/src/tab/mod.rs
@@ -1144,7 +1144,7 @@ impl Tab {
.floating_panes
.resize_active_pane_left(client_id, &mut self.os_api);
if successfully_resized {
- self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" incase of a decrease
+ self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" in case of a decrease
}
} else {
self.tiled_panes.resize_active_pane_left(client_id);
@@ -1156,7 +1156,7 @@ impl Tab {
.floating_panes
.resize_active_pane_right(client_id, &mut self.os_api);
if successfully_resized {
- self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" incase of a decrease
+ self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" in case of a decrease
}
} else {
self.tiled_panes.resize_active_pane_right(client_id);
@@ -1168,7 +1168,7 @@ impl Tab {
.floating_panes
.resize_active_pane_down(client_id, &mut self.os_api);
if successfully_resized {
- self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" incase of a decrease
+ self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" in case of a decrease
}
} else {
self.tiled_panes.resize_active_pane_down(client_id);
@@ -1180,7 +1180,7 @@ impl Tab {
.floating_panes
.resize_active_pane_up(client_id, &mut self.os_api);
if successfully_resized {
- self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" incase of a decrease
+ self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" in case of a decrease
}
} else {
self.tiled_panes.resize_active_pane_up(client_id);
@@ -1192,7 +1192,7 @@ impl Tab {
.floating_panes
.resize_active_pane_increase(client_id, &mut self.os_api);
if successfully_resized {
- self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" incase of a decrease
+ self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" in case of a decrease
}
} else {
self.tiled_panes.resize_active_pane_increase(client_id);
@@ -1204,7 +1204,7 @@ impl Tab {
.floating_panes
.resize_active_pane_decrease(client_id, &mut self.os_api);
if successfully_resized {
- self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" incase of a decrease
+ self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" in case of a decrease
}
} else {
self.tiled_panes.resize_active_pane_decrease(client_id);
diff --git a/zellij-utils/src/envs.rs b/zellij-utils/src/envs.rs
index 5bb2b80e9..84af44805 100644
--- a/zellij-utils/src/envs.rs
+++ b/zellij-utils/src/envs.rs
@@ -36,7 +36,7 @@ pub struct EnvironmentVariablesFromYaml {
}
impl EnvironmentVariablesFromYaml {
- /// Merges two structs, keys from `other` supercede keys from `self`
+ /// Merges two structs, keys from `other` supersede keys from `self`
pub fn merge(&self, other: Self) -> Self {
let mut env = self.clone();
env.env.extend(other.env);
diff --git a/zellij-utils/src/input/actions.rs b/zellij-utils/src/input/actions.rs
index 99852b485..3c863f8b5 100644
--- a/zellij-utils/src/input/actions.rs
+++ b/zellij-utils/src/input/actions.rs
@@ -104,7 +104,7 @@ pub enum Action {
GoToTab(u32),
ToggleTab,
TabNameInput(Vec<u8>),
- /// Run speficied command in new pane.
+ /// Run specified command in new pane.
Run(RunCommandAction),
/// Detach session and exit
Detach,
diff --git a/zellij-utils/src/input/layout.rs b/zellij-utils/src/input/layout.rs
index 648f09ac6..4c1131254 100644
--- a/zellij-utils/src/input/layout.rs
+++ b/zellij-utils/src/input/layout.rs
@@ -453,7 +453,7 @@ pub struct LayoutTemplate {
}
impl LayoutTemplate {
- // Insert an optional `[TabLayout]` at the correct postion
+ // Insert an optional `[TabLayout]` at the correct position
pub fn insert_tab_layout(mut self, tab_layout: Option<TabLayout>) -> Self {
if self.body {
return tab_layout.unwrap_or_default().into();
diff --git a/zellij-utils/src/input/options.rs b/zellij-utils/src/input/options.rs
index 22dc0a556..73e77ecb5 100644
--- a/zellij-utils/src/input/options.rs
+++ b/zellij-utils/src/input/options.rs
@@ -122,7 +122,7 @@ impl Options {
}
/// Merges two [`Options`] structs, a `Some` in `other`
- /// will supercede a `Some` in `self`
+ /// will supersede a `Some` in `self`
// TODO: Maybe a good candidate for a macro?
pub fn merge(&self, other: Options) -> Options {
let mouse_mode = other.mouse_mode.or(self.mouse_mode);
@@ -163,7 +163,7 @@ impl Options {
}
/// Merges two [`Options`] structs,
- /// - `Some` in `other` will supercede a `Some` in `self`
+ /// - `Some` in `other` will supersede a `Some` in `self`
/// - `Some(bool)` in `other` will toggle a `Some(bool)` in `self`
// TODO: Maybe a good candidate for a macro?
pub fn merge_from_cli(&self, other: Options) -> Options {
diff --git a/zellij-utils/src/input/plugins.rs b/zellij-utils/src/input/plugins.rs
index 0f11e8f4f..5d169849c 100644
--- a/zellij-utils/src/input/plugins.rs
+++ b/zellij-utils/src/input/plugins.rs
@@ -124,7 +124,7 @@ pub struct PluginConfig {
impl PluginConfig {
/// Resolve wasm plugin bytes for the plugin path and given plugin directory. Attempts to first
/// resolve the plugin path as an absolute path, then adds a ".wasm" extension to the path and
- /// resolves that, finally we use the plugin directoy joined with the path with an appended
+ /// resolves that, finally we use the plugin directory joined with the path with an appended
/// ".wasm" extension. So if our path is "tab-bar" and the given plugin dir is
/// "/home/bob/.zellij/plugins" the lookup chain will be this:
///
@@ -156,7 +156,7 @@ impl PluginConfig {
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[serde(rename_all = "kebab-case")]
pub enum PluginType {
- // TODO: A plugin with output thats cloned across every pane in a tab, or across the entire
+ // TODO: A plugin with output that's cloned across every pane in a tab, or across the entire
// application might be useful
// Tab
// Static
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-29 12:03:32 +0000