From 5822e7e9f22b43b514babc4de9fd349cfe0ba57a Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Mon, 5 Sep 2022 12:22:05 +0200 Subject: [PATCH 1/3] README: fix typos --- README.asciidoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index b789c889..aa23743e 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -359,7 +359,7 @@ directed range of characters. A selection has two ends, the anchor and the cursor. There is always at least one selection, and a selection is always at least -one character (in which case the anchor and cursor of the selections are +one character (in which case the anchor and cursor of the selection are on the same character). Normal Mode @@ -528,7 +528,7 @@ Changes * ``: join selected lines * ``: join selected lines and select spaces inserted in place of line breaks - * ``: merge contiguous selections together (works across lines as well) + * ``: merge contiguous selections together (works across lines as well) * ` (>)`: indent selected lines * ``: indent selected lines, including empty lines @@ -537,7 +537,7 @@ Changes indent (3 leading spaces when indent is 4) * `|`: pipe each selection through the given external filter program - and replace the selection with it's output. + and replace the selection with its output. * ``: pipe each selection through the given external filter program and ignore its output @@ -564,7 +564,7 @@ Changes tabstop option or the count parameter for tabstop. * ``: rotate selections content, if specified, the count groups - selections, so `3` rotate (1, 2, 3) and (3, 4, 6) + selections, so `3` rotate (1, 2, 3) and (4, 5, 6) independently. * ``: rotate selections content backwards @@ -702,7 +702,7 @@ saved in the command history. ** `-debug`: print the given text to the `\*debug*` buffer * `nop`: does nothing, but as with every other commands, arguments may be evaluated. So nop can be used for example to execute a shell command - while being sure that it's output will not be interpreted by kak. + while being sure that its output will not be interpreted by kak. `:%sh{ echo echo tchou }` will echo tchou in Kakoune, whereas `:nop %sh{ echo echo tchou }` will not, but both will execute the shell command. From 4b3749c492887fbb5f97c4e649525012dd7a4dfe Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Mon, 5 Sep 2022 12:29:34 +0200 Subject: [PATCH 2/3] README: don't emphasize that selects because now p does too Note that these sentences talk about the "current" selection but actually mean "each" selection. The next commit will change this. --- README.asciidoc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index aa23743e..9ac8e31c 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -516,10 +516,8 @@ Changes * `y`: yank selections * `p`: paste after current selection end * `P`: paste before current selection begin - * ``: paste all after current selection end, and - select each pasted string. - * ``: paste all before current selection begin, and - select each pasted string. + * ``: paste all after current selection end + * ``: paste all before current selection begin * `R`: replace current selection with yanked text * ``: replace current selection with every yanked text From 4f15f4179c38b9c4289bbaf2dbfac37cf98b4602 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sat, 10 Sep 2022 15:23:50 +0200 Subject: [PATCH 3/3] README: clarify that change commands work on each selection I think "current selection" could be misinterpreted as "main selection", so let's use "each selection". --- README.asciidoc | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index 9ac8e31c..c313ba7b 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -493,33 +493,33 @@ it when pasting text. Changes ~~~~~~~ - * `i`: enter insert mode before current selection - * `a`: enter insert mode after current selection - * `d`: yank and delete current selection - * `c`: yank and delete current selection and enter insert mode + * `i`: enter insert mode before each selection + * `a`: enter insert mode after each selection + * `d`: yank and delete each selection + * `c`: yank and delete each selection and enter insert mode * `.`: repeat last insert mode change (`i`, `a`, or `c`, including the inserted text) - * ``: delete current selection - * ``: delete current selection and enter insert mode + * ``: delete each selection + * ``: delete each selection and enter insert mode - * `I`: enter insert mode at current selection begin line start - * `A`: enter insert mode at current selection end line end + * `I`: enter insert mode at each selection begin line start + * `A`: enter insert mode at each selection end line end * `o`: enter insert mode in one (or given count) new lines below - current selection end + each selection end * `O`: enter insert mode in one (or given count) new lines above - current selection begin + each selection begin - * ``: add an empty line below cursor - * ``: add an empty line above cursor + * ``: add an empty line below each cursor + * ``: add an empty line above each cursor * `y`: yank selections - * `p`: paste after current selection end - * `P`: paste before current selection begin - * ``: paste all after current selection end - * ``: paste all before current selection begin - * `R`: replace current selection with yanked text - * ``: replace current selection with every yanked text + * `p`: paste after each selection end + * `P`: paste before each selection begin + * ``: paste all after each selection end + * ``: paste all before each selection begin + * `R`: replace each selection with yanked text + * ``: replace each selection with every yanked text * `r`: replace each character with the next entered one @@ -539,15 +539,15 @@ Changes * ``: pipe each selection through the given external filter program and ignore its output - * `!`: insert command output before selection - * ``: append command output after selection + * `!`: insert command output before each selection + * ``: append command output after each selection * `u`: undo last change * ``: move backward in history * `U`: redo last change * ``: move forward in history - * `&`: align selection, align the cursor of selections by inserting + * `&`: align selections, align the cursor of selections by inserting spaces before the first character of the selection * ``: copy indent, copy the indentation of the main selection (or the count one if a count is given) to all other ones @@ -556,10 +556,10 @@ Changes * `~`: to upper case * ````: swap case - * `@`: convert tabs to spaces in current selections, uses the buffer - tabstop option or the count parameter for tabstop. - * ``: convert spaces to tabs in current selections, uses the buffer - tabstop option or the count parameter for tabstop. + * `@`: convert selected tabs to spaces, uses the buffer tabstop option or + the count parameter for tabstop. + * ``: convert selected spaces to tabs, uses the buffer tabstop option + or the count parameter for tabstop. * ``: rotate selections content, if specified, the count groups selections, so `3` rotate (1, 2, 3) and (4, 5, 6)