diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | book/src/commands.md | 2 | ||||
| -rw-r--r-- | book/src/from-vim.md | 4 | ||||
| -rw-r--r-- | book/src/guides/adding_languages.md | 2 | ||||
| -rw-r--r-- | book/src/keymap.md | 4 | ||||
| -rw-r--r-- | book/src/usage.md | 4 | ||||
| -rw-r--r-- | helix-core/src/movement.rs | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 73d37a57..56d85751 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -684,7 +684,7 @@ Usability improvements and fixes: - File picker configuration ([#988](https://github.com/helix-editor/helix/pull/988)) - Fix surround cursor position calculation ([#1183](https://github.com/helix-editor/helix/pull/1183)) - Accept count for goto_window ([#1033](https://github.com/helix-editor/helix/pull/1033)) -- Make kill_to_line_end behave like emacs ([#1235](https://github.com/helix-editor/helix/pull/1235)) +- Make kill_to_line_end behave like Emacs ([#1235](https://github.com/helix-editor/helix/pull/1235)) - Only use a single documentation popup ([#1241](https://github.com/helix-editor/helix/pull/1241)) - ui: popup: Don't allow scrolling past the end of content ([`3307f44c`](https://github.com/helix-editor/helix/commit/3307f44c)) - Open files with spaces in filename, allow opening multiple files ([#1231](https://github.com/helix-editor/helix/pull/1231)) @@ -922,7 +922,7 @@ to distinguish it in bug reports.. on cargo run. `~/.config/helix/runtime` can also be used. - Registers can now be selected via " (for example `"ay`) - Support for Nix files was added -- Movement is now fully tested and matches kakoune implementation +- Movement is now fully tested and matches Kakoune implementation - A per-file LSP symbol picker was added to space+s - Selection can be replaced with yanked text via R @@ -946,7 +946,7 @@ Keymaps: - The runtime/ can now optionally be embedded in the binary - Haskell syntax added - Window mode (ctrl-w) added -- Show matching bracket (vim's matchbrackets) +- Show matching bracket (Vim's matchbrackets) - Themes now support style modifiers - First user contributed theme - Create a document if it doesn't exist yet on save @@ -4,10 +4,10 @@  -A kakoune / neovim inspired editor, written in Rust. +A Kakoune / Neovim inspired editor, written in Rust. -The editing model is very heavily based on kakoune; during development I found -myself agreeing with most of kakoune's design decisions. +The editing model is very heavily based on Kakoune; during development I found +myself agreeing with most of Kakoune's design decisions. For more information, see the [website](https://helix-editor.com) or [documentation](https://docs.helix-editor.com/). @@ -24,7 +24,7 @@ All shortcuts/keymaps can be found [in the documentation on the website](https:/ - Smart, incremental syntax highlighting and code editing via tree-sitter It's a terminal-based editor first, but I'd like to explore a custom renderer -(similar to emacs) in wgpu or skulpin. +(similar to Emacs) in wgpu or skulpin. Note: Only certain languages have indentation definitions at the moment. Check `runtime/queries/<lang>/` for `indents.scm`. diff --git a/book/src/commands.md b/book/src/commands.md index 4c4a5c05..d9a11386 100644 --- a/book/src/commands.md +++ b/book/src/commands.md @@ -1,5 +1,5 @@ # Commands -Command mode can be activated by pressing `:`, similar to vim. Built-in commands: +Command mode can be activated by pressing `:`, similar to Vim. Built-in commands: {{#include ./generated/typable-cmd.md}} diff --git a/book/src/from-vim.md b/book/src/from-vim.md index 54f8d3b1..6ace9102 100644 --- a/book/src/from-vim.md +++ b/book/src/from-vim.md @@ -1,7 +1,7 @@ # Migrating from Vim -Helix's editing model is strongly inspired from vim and kakoune, and a notable -difference from vim (and the most striking similarity to kakoune) is that Helix +Helix's editing model is strongly inspired from Vim and Kakoune, and a notable +difference from Vim (and the most striking similarity to Kakoune) is that Helix follows the `selection → action` model. This means that the whatever you are going to act on (a word, a paragraph, a line, etc) is selected first and the action itself (delete, change, yank, etc) comes second. A cursor is simply a diff --git a/book/src/guides/adding_languages.md b/book/src/guides/adding_languages.md index 5be7a264..6598b9bf 100644 --- a/book/src/guides/adding_languages.md +++ b/book/src/guides/adding_languages.md @@ -29,7 +29,7 @@ language with the path `runtime/queries/<name>/`. The tree-sitter gives more info on how to write queries. > NOTE: When evaluating queries, the first matching query takes -precedence, which is different from other editors like neovim where +precedence, which is different from other editors like Neovim where the last matching query supersedes the ones before it. See [this issue][neovim-query-precedence] for an example. diff --git a/book/src/keymap.md b/book/src/keymap.md index 5a506ba0..99b0f0ba 100644 --- a/book/src/keymap.md +++ b/book/src/keymap.md @@ -27,7 +27,7 @@ ### Movement -> NOTE: Unlike vim, `f`, `F`, `t` and `T` are not confined to the current line. +> NOTE: Unlike Vim, `f`, `F`, `t` and `T` are not confined to the current line. | Key | Description | Command | | ----- | ----------- | ------- | @@ -229,7 +229,7 @@ TODO: Mappings for selecting syntax nodes (a superset of `[`). #### Window mode -This layer is similar to vim keybindings as kakoune does not support window. +This layer is similar to Vim keybindings as Kakoune does not support window. | Key | Description | Command | | ----- | ------------- | ------- | diff --git a/book/src/usage.md b/book/src/usage.md index 600a514f..fc3a83ee 100644 --- a/book/src/usage.md +++ b/book/src/usage.md @@ -128,8 +128,8 @@ will move the selection over to the "func" `identifier`.   -- `ma` - Select around the object (`va` in vim, `<alt-a>` in kakoune) -- `mi` - Select inside the object (`vi` in vim, `<alt-i>` in kakoune) +- `ma` - Select around the object (`va` in Vim, `<alt-a>` in Kakoune) +- `mi` - Select inside the object (`vi` in Vim, `<alt-i>` in Kakoune) | Key after `mi` or `ma` | Textobject selected | | --- | --- | diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs index fa8cdf3a..c232484c 100644 --- a/helix-core/src/movement.rs +++ b/helix-core/src/movement.rs @@ -270,7 +270,7 @@ pub enum WordMotionTarget { NextWordEnd, PrevWordStart, PrevWordEnd, - // A "Long word" (also known as a WORD in vim/kakoune) is strictly + // A "Long word" (also known as a WORD in Vim/Kakoune) is strictly // delimited by whitespace, and can consist of punctuation as well // as alphanumerics. NextLongWordStart, |