From 9613e7fa2730075564514027510b2d5c387db749 Mon Sep 17 00:00:00 2001 From: lesleyrs <19632758+lesleyrs@users.noreply.github.com> Date: Thu, 1 Dec 2022 18:04:10 +0100 Subject: [PATCH 1/5] Add Ctrl-i alias for Windows --- helix-term/src/keymap/default.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs index 118764d97585..4b7066b9775c 100644 --- a/helix-term/src/keymap/default.rs +++ b/helix-term/src/keymap/default.rs @@ -198,7 +198,7 @@ pub fn default() -> HashMap { // z family for save/restore/combine from/to sels from register - "tab" => jump_forward, // tab == + "tab" | "C-i" => jump_forward, // tab == on Linux, is for Windows "C-o" => jump_backward, "C-s" => save_selection, From abdc2e797eb2cfd0227d7277462e35b5f99f7008 Mon Sep 17 00:00:00 2001 From: return2monki <19632758+return2monki@users.noreply.github.com> Date: Thu, 1 Dec 2022 18:36:36 +0100 Subject: [PATCH 2/5] tutor fixes --- runtime/tutor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 957af64035f4..3c7c2fe6af3d 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -671,8 +671,8 @@ _________________________________________________________________ for instance. --> This is some text for you to repeat things. You can repeat - insertions like changing words, or repeat selections like - f / t. + --> insertions like changing words, or repeat selections like + --> f / t. @@ -852,9 +852,9 @@ lines. 5. Move to the line below and put your cursor on '>' again. 6. Type q to repeat the macro. - --> ... sentence doesn't have it's first and last ... . - --> ... sentence doesn't have it's first and last ... . - This sentence doesn't have it's first and last word. + --> ... sentence doesn't have its first and last ... . + --> ... sentence doesn't have its first and last ... . + This sentence doesn't have its first and last word. ================================================================= = CHAPTER 8 RECAP = From b4964f45a67f521af4580a955782b26cfdd1a3cc Mon Sep 17 00:00:00 2001 From: return2monki <19632758+return2monki@users.noreply.github.com> Date: Thu, 1 Dec 2022 20:31:04 +0100 Subject: [PATCH 3/5] match #4939 --- helix-term/src/keymap/default.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs index 4b7066b9775c..c0d17a87e065 100644 --- a/helix-term/src/keymap/default.rs +++ b/helix-term/src/keymap/default.rs @@ -198,7 +198,7 @@ pub fn default() -> HashMap { // z family for save/restore/combine from/to sels from register - "tab" | "C-i" => jump_forward, // tab == on Linux, is for Windows + "C-i" | "tab" => jump_forward, // tab == "C-o" => jump_backward, "C-s" => save_selection, From 96ef8226aca8638c60f733c4c674787658dcb6ad Mon Sep 17 00:00:00 2001 From: return2monki <19632758+return2monki@users.noreply.github.com> Date: Fri, 2 Dec 2022 11:18:46 +0100 Subject: [PATCH 4/5] revert tutor --- runtime/tutor | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 3c7c2fe6af3d..eb1d9885350e 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -671,8 +671,8 @@ _________________________________________________________________ for instance. --> This is some text for you to repeat things. You can repeat - --> insertions like changing words, or repeat selections like - --> f / t. + insertions like changing words, or repeat selections like + f / t. @@ -845,16 +845,16 @@ lines. Type q to repeat the macro from register @ (the default). 1. Move the cursor to the first line marked '-->' below. - Ensure your cursor is on the '>' of the arrow. + Ensure your cursor is on the > of the arrow. 2. Type Q to start recording. 3. Edit the line to look like the bottom one. 4. Exit insert and Type Q again to stop recording. - 5. Move to the line below and put your cursor on '>' again. + 5. Move to the line below and put your cursor on the > again. 6. Type q to repeat the macro. - --> ... sentence doesn't have its first and last ... . - --> ... sentence doesn't have its first and last ... . - This sentence doesn't have its first and last word. + --> ... sentence doesn't have it's first and last ... . + --> ... sentence doesn't have it's first and last ... . + This sentence doesn't have it's first and last word. ================================================================= = CHAPTER 8 RECAP = From 4d76073cd40298c30bd6255ffd914d6ab9d5902c Mon Sep 17 00:00:00 2001 From: return2monki <19632758+return2monki@users.noreply.github.com> Date: Fri, 2 Dec 2022 11:31:32 +0100 Subject: [PATCH 5/5] missed some newer changes --- runtime/tutor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index eb1d9885350e..957af64035f4 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -845,11 +845,11 @@ lines. Type q to repeat the macro from register @ (the default). 1. Move the cursor to the first line marked '-->' below. - Ensure your cursor is on the > of the arrow. + Ensure your cursor is on the '>' of the arrow. 2. Type Q to start recording. 3. Edit the line to look like the bottom one. 4. Exit insert and Type Q again to stop recording. - 5. Move to the line below and put your cursor on the > again. + 5. Move to the line below and put your cursor on '>' again. 6. Type q to repeat the macro. --> ... sentence doesn't have it's first and last ... .