diff options
Diffstat (limited to 'book/src')
-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 |
5 files changed, 8 insertions, 8 deletions
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`. ![textobject-demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif) ![textobject-treesitter-demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif) -- `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 | | --- | --- | |