aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-rw-r--r--INSTALL.md2
-rw-r--r--client.c2
-rw-r--r--grid.c4
-rw-r--r--main.c2
-rw-r--r--render.c4
-rw-r--r--shm.c2
-rw-r--r--terminal.c4
-rw-r--r--url-mode.c2
9 files changed, 14 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1c7bb32..603cf5b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -409,10 +409,10 @@
has terminated very early (for example, by trying to launch a
non-existing shell/client).
* Glitchy rendering when scrolling in the scrollback, on compositors
- that does not allow Wayland buffer re-use (e.g. KDE/plasma)
+ that does not allow Wayland buffer reuse (e.g. KDE/plasma)
([#1173][1173])
* Scrollback search matches not being highlighted correctly, on
- compositors that does not allow Wayland buffer re-use
+ compositors that does not allow Wayland buffer reuse
(e.g. KDE/plasma).
* Nanosecs "overflow" when calculating timeout value for
`resize-delay-ms` option.
@@ -2331,7 +2331,7 @@ means foot can be PGO:d in e.g. sandboxed build scripts. See
* Window title always being set to "foot" on reset.
* Terminfo entry `kb2` (center keypad key); it is now set to `\EOu`
(which is what foot emits) instead of the incorrect value `\EOE`.
-* Palette re-use in sixel images. Previously, the palette was reset
+* Palette reuse in sixel images. Previously, the palette was reset
after each image.
* Do not auto-resize a sixel image for which the client has specified
a size. This fixes an issue where an image would incorrectly
diff --git a/INSTALL.md b/INSTALL.md
index 67e6b910..22ea8067 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -169,7 +169,7 @@ under a different name. Setting this changes the default value of
If you want foot to use the terminfo files from ncurses, but still
package foot's own terminfo files under a different name, you can use
the `-Dterminfo-base-name` option. Many distributions use the name
-`foot-extra`, and thus it might be a good idea to re-use that:
+`foot-extra`, and thus it might be a good idea to reuse that:
```sh
meson ... -Ddefault-terminfo=foot -Dterminfo-base-name=foot-extra
diff --git a/client.c b/client.c
index e68f71aa..8456dfd8 100644
--- a/client.c
+++ b/client.c
@@ -149,7 +149,7 @@ int
main(int argc, char *const *argv)
{
/* Custom exit code, to enable users to differentiate between foot
- * itself failing, and the client application failiing */
+ * itself failing, and the client application failing */
static const int foot_exit_failure = -36;
int ret = foot_exit_failure;
diff --git a/grid.c b/grid.c
index 22d2a89a..ea103c65 100644
--- a/grid.c
+++ b/grid.c
@@ -584,7 +584,7 @@ _line_wrap(struct grid *old_grid, struct row **new_grid, struct row *row,
new_row = grid_row_alloc(col_count, false);
new_grid[*row_idx] = new_row;
} else {
- /* Scrollback is full, need to re-use a row */
+ /* Scrollback is full, need to reuse a row */
grid_row_reset_extra(new_row);
new_row->linebreak = false;
new_row->prompt_marker = false;
@@ -597,7 +597,7 @@ _line_wrap(struct grid *old_grid, struct row **new_grid, struct row *row,
}
/*
- * TODO: detect if the re-used row is covered by the
+ * TODO: detect if the reused row is covered by the
* selection. Of so, cancel the selection. The problem: we
* don’t know if we’ve translated the selection coordinates
* yet.
diff --git a/main.c b/main.c
index 631ef167..4fc8f439 100644
--- a/main.c
+++ b/main.c
@@ -176,7 +176,7 @@ int
main(int argc, char *const *argv)
{
/* Custom exit code, to enable users to differentiate between foot
- * itself failing, and the client application failiing */
+ * itself failing, and the client application failing */
static const int foot_exit_failure = -26;
int ret = foot_exit_failure;
diff --git a/render.c b/render.c
index 70b3fba0..517c4b31 100644
--- a/render.c
+++ b/render.c
@@ -1614,7 +1614,7 @@ render_overlay(struct terminal *term)
buf->age == 0;
if (!buffer_reuse) {
- /* Can’t re-use last frame’s damage - set to full window,
+ /* Can’t reuse last frame’s damage - set to full window,
* to ensure *everything* is updated */
pixman_region32_init_rect(
&old_see_through, 0, 0, buf->width, buf->height);
@@ -4026,7 +4026,7 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
/*
* Since text reflow is slow, don’t do it *while* resizing. Only
* do it when done, or after “pausing” the resize for sufficiently
- * long. We re-use the TIOCSWINSZ timer to handle this. See
+ * long. We reuse the TIOCSWINSZ timer to handle this. See
* send_dimensions_to_client() and fdm_tiocswinsz().
*
* To be able to do the final reflow correctly, we need a copy of
diff --git a/shm.c b/shm.c
index 4394dbe9..daa2a47c 100644
--- a/shm.c
+++ b/shm.c
@@ -555,7 +555,7 @@ shm_get_buffer(struct buffer_chain *chain, int width, int height)
cached = buf;
else {
/* We have multiple buffers eligible for
- * re-use. Pick the “youngest” one, and mark the
+ * reuse. Pick the “youngest” one, and mark the
* other one for purging */
if (buf->public.age < cached->public.age) {
shm_unref(&cached->public);
diff --git a/terminal.c b/terminal.c
index 06f47685..b577236f 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2675,7 +2675,7 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows
/*
* Selection is (partly) inside either the top or bottom
* scrolling regions, or on (at least one) of the lines
- * scrolled in (i.e. re-used lines).
+ * scrolled in (i.e. reused lines).
*/
if (selection_on_top_region(term, region) ||
selection_on_bottom_region(term, region))
@@ -2749,7 +2749,7 @@ term_scroll_reverse_partial(struct terminal *term,
/*
* Selection is (partly) inside either the top or bottom
* scrolling regions, or on (at least one) of the lines
- * scrolled in (i.e. re-used lines).
+ * scrolled in (i.e. reused lines).
*/
if (selection_on_top_region(term, region) ||
selection_on_bottom_region(term, region))
diff --git a/url-mode.c b/url-mode.c
index e4ff0d8c..76e2869d 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -697,7 +697,7 @@ urls_assign_key_combos(const struct config *conf, url_list_t *urls)
/*
* Scan previous URLs, and check if *this* URL matches any of
- * them; if so, re-use the *same* key combo.
+ * them; if so, reuse the *same* key combo.
*/
bool url_already_seen = false;
tll_foreach(*urls, it2) {