Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'runtime/tutor')
| -rw-r--r-- | runtime/tutor | 74 |
1 files changed, 26 insertions, 48 deletions
diff --git a/runtime/tutor b/runtime/tutor index 30c0f102..505f8848 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -316,7 +316,7 @@ Insert mode, so it is a very common shorthand for di. 1. Move the cursor to the line marked '-->' below. - 2. Move to the start of an incorrect word and type e to + 2. Move to the start of an incorrect word and type w to select it. 3. Type c to delete the word and enter Insert mode. 4. Type the correct word. @@ -337,7 +337,7 @@ 1. Move the cursor to the line marked '-->' below. 2. Type 2w to move 2 words forward. 3. Type 3e to move to the end of the third word forward. - 4. Type 2b to move 2 words backwards. + 4. Type 2b to move 2 words backwards 5. Try the above with different numbers. --> This is just a line with words you can move around in. @@ -391,8 +391,8 @@ --> 6) Sugar is sweet, --> 7) And so are you. - Note: X works similarly to x although it doesn't extend to - subsequent lines. X on an empty line does nothing. + Note : X works similarly to x although it doesn't extend to + subsequent lines. X on an empty line does nothing. ================================================================= = 3.8 COLLAPSING SELECTIONS = @@ -411,8 +411,8 @@ --> This is an error-free line with words to move around in. Note: This works the same in Select mode. - Note: Another related command is Alt-; which flips the direction - of the selection (flips the selection's cursor and anchor). + Note: Another related command is Alt-; which flips selections. + @@ -755,7 +755,7 @@ 1. Move the cursor to the line marked '-->' below. 2. Type w to select "watermelons" and then y to yank it. 3. Select "oranges" with w. - 4. Type R to replace "oranges" with "watermelons". + 4. Type R to replace "oranges" with "watermelons" --> I like watermelons because oranges are refreshing. @@ -989,28 +989,6 @@ lines. ================================================================= -= 9.4 JUMP WITH TWO-CHARACTER LABELS = -================================================================= - - Type gw to enable the 2-character labels. The start of each word - will be replaced by 2 highlighted characters. Type any sequence - of 2 highlighted characters to jump to the corresponding label, - or use ESC to drop the labels. - - The 2-character labels allow you to quickly jump to any location - in the viewable selection. - - 1. Move the cursor to the start of the line marked '-->' below. - 2. Press gw to enable the 2-character labels, and then the two - characters that replace the two letters he at the start of - here to jump to the corresponding word. - - --> This is just a simple line of text. - There may be many such lines - But you really want to jump here! - This is fast with the 2-character labels. - -================================================================= = CHAPTER 9 RECAP = ================================================================= @@ -1023,8 +1001,8 @@ lines. * Press Ctrl-i and Ctrl-o to go forward and backward in the jumplist. - * Type gw to enable 2-character labels, and any 2 characters to - jump to the corresponding label, or ESC to drop the labels. + + @@ -1044,8 +1022,8 @@ lines. 1. Move the cursor to the line marked '-->' below. 2. Select both lines with xx or 2x. 3. Type s to select, type "would" and enter. - 4. Use ( and ) to cycle the primary selection and deselect - the second "would" with Alt-, . + 4. Use ( and ) to cycle the primary selection and remove the + very second "would" with Alt-, . 5. Type c "wood" to change the remaining "would"s to "wood". --> How much would would a wouldchuck chuck @@ -1169,11 +1147,11 @@ letters! that is not good grammar. you can fix this. ================================================================= Using the selections and multi-cursor functionality, you can - comment multiple lines as long as they are under the selection or + comment multiple lines as long as it is under the selection or cursors. 1. Move your cursor to the line marked with '-->' below. - 2. Now try to select or add more cursors to the other lines marked + 2. Now try to select or add more cursors the other lines marked with '-->'. 3. Comment those lines. @@ -1223,7 +1201,7 @@ letters! that is not good grammar. you can fix this. to the matching ). You can do the same on the line below: for example move to ], and press mm to jump to [ . - --> you can (jump between matching parentheses) + --> you can (jump between matching parenthesis) --> or between matching [ square brackets ] --> now { you know the drill: this works with brackets too } @@ -1238,19 +1216,19 @@ letters! that is not good grammar. you can fix this. pair of brackets or other delimiters. In the lines below: - move to the --> line, put your cursor in normal mode at any - location between the parentheses, for example at 'x', and press - mi( or mi) to select the whole content inside the parentheses - (parentheses excluded). As usual, you can then do anything you want + location between the parenthesis, for example at 'x', and press + mi( or mi) to select the whole content inside the parenthesis + (parenthesis excluded). As usual, you can then do anything you want with the selection (for example, press c to change it) - --> outside and (inside x parentheses) - and outside again + --> outside and (inside x parenthesis) - and outside again Test below that you can do the same with [], or {}, or with nested combinations of these (this will act on the immediately surrounding matching pair). This also works with "" and similar --> test [ with square brackets ] ! - --> try ( with nested [ pairs of ( parentheses) and "brackets" ]) + --> try ( with nested [ pairs of ( parenthesis) and "brackets" ]) ================================================================= = 12.3 USING MATCH MODE SELECT AROUND = @@ -1284,7 +1262,7 @@ letters! that is not good grammar. you can fix this. move in normal mode the cursor to the start of select, then enter selection mode with v , then select the 4 next words with 4e ), * ii) press ms( or ms) to surround the selection with a pair of - parentheses. + parenthesis. --> so, select all of this, and surround it with () @@ -1304,9 +1282,9 @@ letters! that is not good grammar. you can fix this. command. On the line below, move the cursor anywhere within the pair of (), for example to the 'x', then from there, in normal mode, press md( or md) to delete the surrounding - pair of parentheses. + pair of parenthesis. - --> delete (the x pair of parentheses) from within! + --> delete (the x pair of parenthesis) from within! You can naturally delete other kinds of surroundings: @@ -1315,7 +1293,7 @@ letters! that is not good grammar. you can fix this. --> delete "layers "of" quote marks" too: this will delete the nearest previous and following quote marks - Trying to delete nonexistent surrounding delimiters prints an error + Trying to delete unexisting surrounding delimiters print an error at the bottom bar and does nothing. ================================================================= @@ -1336,7 +1314,7 @@ letters! that is not good grammar. you can fix this. --> some (nested surroundings [can be replaced]) --> this "works with 'other surroundings' too" - You can try to replace a nonexistent pair: this will show + You can try to replace a non existing pair: this will show an error warning at the bottom bar and do nothing. @@ -1462,7 +1440,7 @@ letters! that is not good grammar. you can fix this. Still from hello2, press Ctrl-w H to swap with the split on the left: now hello2 is on the left and the tutor is on the top - right. After Ctrl-w you can use HJKL to swap with the buffer + right. After Ctrl-w you can use HJKL to split with the buffer on the left / below / above / on the right. Move back to the tutor split, and press Ctrl-w o to only keep @@ -1477,7 +1455,7 @@ letters! that is not good grammar. you can fix this. ================================================================= Open a split on the left with :vs hello1 and then a split below - with :hs hello2. + with :vs hello2. Move to the tutor split, then press Ctrl-w t to transpose the vertical split opened from this window: now, hello1 and |