Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling #1257

Merged
merged 6 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manual/src/full---help-output.md
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ OPTIONS:
--tabs <N>
The number of spaces to replace tab characters with.

Use --tabs=0 to pass tab characters through directly, but note that in that case delta will calculate line widths assuming tabs occupy one character's width on the screen: if your terminal renders tabs as more than than one character wide then delta's output will look incorrect.
Use --tabs=0 to pass tab characters through directly, but note that in that case delta will calculate line widths assuming tabs occupy one character's width on the screen: if your terminal renders tabs as more than one character wide then delta's output will look incorrect.

[default: 4]

Expand Down
2 changes: 1 addition & 1 deletion src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ pub struct Opt {
///
/// Use --tabs=0 to pass tab characters through directly, but note that in that case delta will
/// calculate line widths assuming tabs occupy one character's width on the screen: if your
/// terminal renders tabs as more than than one character wide then delta's output will look
/// terminal renders tabs as more than one character wide then delta's output will look
/// incorrect.
pub tab_width: usize,

Expand Down
2 changes: 1 addition & 1 deletion src/features/hyperlinks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ __path__: some matching line
}

/// Return the relative path as it would appear in grep output, i.e. accounting for facts
/// such as that that the user may have invoked the grep command from a non-root directory
/// such as that the user may have invoked the grep command from a non-root directory
/// in the repo.
pub fn path_in_grep_output(&self) -> String {
use CallingProcess::*;
Expand Down
2 changes: 1 addition & 1 deletion src/features/side_by_side.rs
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ fn get_right_fill_style_for_panel<'a>(
background_color_extends_to_terminal_width: BgShouldFill,
config: &Config,
) -> (Option<BgFillMethod>, Style) {
// If in the the left panel then it must be filled with spaces.
// If in the left panel then it must be filled with spaces.
let none_or_override = if panel_side == Left {
Some(BgFillMethod::Spaces)
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/paint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl<'p> Painter<'p> {
))
} else if config.side_by_side {
// If line numbers are disabled in side-by-side then the data is still used
// for width calculaction and to pad odd width to even, see `UseFullPanelWidth`
// for width calculation and to pad odd width to even, see `UseFullPanelWidth`
// for details.
Some(line_numbers::LineNumbersData::empty_for_sbs(
panel_width_fix,
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test_example_diffs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ src/align.rs:71: impl<'a> Alignment<'a> { │
fn test_hyperlinks_commit_link_format() {
// If commit-style is not set then the commit line is handled in raw
// mode, in which case we only format hyperlinks if output is a tty;
// this causes the test to fail on Github Actions, but pass locally
// this causes the test to fail on GitHub Actions, but pass locally
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brand

// if output is left going to the screen.
DeltaTest::with_args(&[
"--commit-style",
Expand Down
2 changes: 1 addition & 1 deletion src/utils/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ pub mod tests {

#[test]
fn test_process_calling_cmdline() {
// Github runs CI tests for arm under qemu where where sysinfo can not find the parent process.
// GitHub runs CI tests for arm under qemu where sysinfo can not find the parent process.
if std::env::vars().any(|(key, _)| key == "CROSS_RUNNER" || key == "QEMU_LD_PREFIX") {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion themes.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
minus-style = "#ff0080"
plus-emph-style = "#008a81" bold "#00ffbf"
plus-style = syntax "#cffff3"
syntax-theme = Github
syntax-theme = GitHub
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely certain that this change works, but I hope that the syntax-theme is case-insensitive


[delta "hoopoe"]
# author: https://github.com/dandavison
Expand Down