Merge branch 'master' into clear_jump_list

helix-editor · Jul 1, 2023 · 634d063 · 634d063
2 parents dc57716 + a9849eb
commit 634d063
Show file tree

Hide file tree

Showing 76 changed files with 2,666 additions and 1,254 deletions.
diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
  uses: actions/checkout@v3
 
  - name: Install nix
- uses: cachix/install-nix-action@v21
+ uses: cachix/install-nix-action@v22
 
  - name: Authenticate with Cachix
  uses: cachix/cachix-action@v12

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1596,7 +1596,7 @@ to distinguish it in bug reports..
 
 - The `runtime/` directory is now properly detected on binary releases and
  on cargo run. `~/.config/helix/runtime` can also be used.
-- Registers can now be selected via " (for example `"ay`)
+- Registers can now be selected via " (for example, `"ay`)
 - Support for Nix files was added
 - Movement is now fully tested and matches Kakoune implementation
 - A per-file LSP symbol picker was added to space+s