rutnime(new-tutor): Updated English new tutor
Commit:
https://github.com/vim/vim/commit/9d57fe278f71117414956a33c9beb1407c420ae2
Author: RestorerZ <[email protected]>
Date: Wed Oct 1 20:26:54 2025 +0000
rutnime(new-tutor): Updated English new tutor
This updates the new tutor with the changes from commit
b87f133b0724f7328e7dd41dd611af67f4ae3e39
closes: #18461
Signed-off-by: RestorerZ <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/tutor/en/vim-02-beginner.tutor
b/runtime/tutor/en/vim-02-beginner.tutor
index 1e88067da..a5d24f1b8 100644
--- a/runtime/tutor/en/vim-02-beginner.tutor
+++ b/runtime/tutor/en/vim-02-beginner.tutor
@@ -14,7 +14,42 @@
depending upon how much time is spent with experimentation.
-# Lesson 2.1.1: THE NAMED REGISTERS
+# Lesson 2.1.1: MASTERING TEXT OBJECTS
+
+ ** Operate on logical text blocks with precision using text objects **
+
+ 1. Practice word operations:
+ - Place cursor on any word in the line below
+ - Type `diw`{normal} to delete INNER word (word without surrounding space)
+ - Type `daw`{normal} to delete A WORD (including trailing whitespace)
+ - Try with other operators: `ciw`{normal} (change), `yiw`{normal} (yank),
+ `gqiw`{normal} (format)
+
+Practice on: "Vim's", (text_object), and 'powerful' words here.
+
+ 2. Work with bracketed content:
+ - Put cursor inside any () {} [] <> pair below
+ - Type `di(`{normal} or `dib`{normal} (delete inner bracket)
+ - Type `da(`{normal} or `dab`{normal} (delete around brackets)
+ - Try same with `i"`{normal}/`a"`{normal} for quotes,
`it`{normal}/`at`{normal} for HTML/XML tags
+
+Test cases: {curly}, [square], <angle>, and "quoted" items.
+
+ 3. Paragraph and sentence manipulation:
+ - Use `dip`{normal} to delete inner paragraph (cursor anywhere in
paragraph)
+ - Use `vap`{normal} to visually select entire paragraph
+ - Try `das`{normal} to delete a sentence (works between .!? punctuation)
+
+ 4. Advanced combinations:
+ - `ciwnew<ESC>`{normal} - Change current word to "new"
+ - `yss"<ESC>`{normal} - Wrap entire line in quotes (vim-surround plugin
style)
+ - `gUit`{normal} - Uppercase inner HTML tag content
+ - `va"p`{normal} - Select quoted text and paste over it
+
+Final exercise: (Modify "this" text) by [applying {various} operations]<
+
+
+# Lesson 2.1.2: THE NAMED REGISTERS
** Store two yanked words concurrently and then paste them **
@@ -45,7 +80,7 @@ REFERENCE: [Registers](registers)
[CTRL-R](i_CTRL-R)
-# Lesson 2.1.2: THE EXPRESSION REGISTER
+# Lesson 2.1.3: THE EXPRESSION REGISTER
** Insert the results of calculations on the fly **
@@ -70,7 +105,7 @@ NOTE: the same can be achieved with
`:pu=`{normal}`system('date')`{vim}
REFERENCE: [Expression Register](quote=)
-# Lesson 2.1.3: THE NUMBERED REGISTERS
+# Lesson 2.1.4: THE NUMBERED REGISTERS
** Press `yy`{normal} and `dd`{normal} to witness their effect on the
registers **
@@ -107,7 +142,52 @@ NOTE: Whole line deletions (`dd`{normal}) are much longer
lived in the
REFERENCE: [Numbered Registers](quote0)
-# Lesson 2.1.4: THE BEAUTY OF MARKS
+# Lesson 2.1.5: SPECIAL REGISTERS
+
+ ** Use system clipboard and blackhole registers for advanced editing **
+
+ Note: Clipboard use requires X11/Wayland libraries on Linux systems AND
+ a Vim built with "+clipboard" (usually a Huge build). Check with
+ `:version`{vim} and `:echo has('clipboard_working')`{vim}
+
+ 1. Clipboard registers `+`{normal} and `*`{normal} :
+ - `"+y`{normal} - Yank to system clipboard (e.g. `"+yy`{normal} for
current line)
+ - `"+p`{normal} - Paste from system clipboard
+ - `"*`{normal} is primary selection on X11 (middle-click), `"+`{normal}
is clipboard
+
+Try: "+yy then paste into another application with Ctrl-V or Cmd+V
+
+ 2. Blackhole register `_`{normal} discards text:
+ - `"_daw`{normal} - Delete word without saving to any register
+ - Useful when you don't want to overwrite your default `"`{normal}
register
+ - Note this is using the "a Word" text object, introduced in a previous
+ lession
+ - `"_dd`{normal} - Delete line without saving
+ - `"_dap`{normal} - Delete paragraph without saving
+ - Combine with counts: `3"_dw`{normal}
+
+Practice: "_diw on any word to delete it without affecting yank history
+
+ 3. Combine with visual selections:
+ - Select text with V then `"+y`{normal}
+ - To paste from clipboard in insert mode: `<CTRL-R>+`{normal}
+ - Try opening another application and paste from clipboard
+
+ 4. Remember:
+ - Clipboard registers work across different Vim instances
+ - Clipboard register is not always working
+ - Blackhole prevents accidental register overwrites
+ - Default `"`{normal} register is still available for normal yank/paste
+ - Named registers (a-z) remain private to each Vim session
+
+ 5. Clipboard troubleshooting:
+ - Check support with `:echo has('clipboard_working')`{vim}
+ - 1 means available, 0 means not compiled in
+ - On Linux, may need vim-gtk or vim-x11 package
+ (check `:version`{vim} output)
+
+
+# Lesson 2.1.6: THE BEAUTY OF MARKS
** Code monkey arithmetic avoidance **
@@ -162,33 +242,46 @@ REFERENCE: [Marks](marks)
# Lesson 2.1 SUMMARY
- 1. To store (yank, delete) text into, and retrieve (paste) from, a total of
+ 1. Text objects provide precision editing:
+ - `iw`{normal}/`aw`{normal} - inner/around word
+ - `i[`{normal}/`a[`{normal} - inner/around bracket
+ - `i"`{normal}/`a"`{normal} - inner/around quotes
+ - `it`{normal}/`at`{normal} - inner/around tag
+ - `ip`{normal}/`ap`{normal} - inner/around paragraph
+ - `is`{normal}/`as`{normal} - inner/around sentence
+
+ 2. To store (yank, delete) text into, and retrieve (paste) from, a total of
26 registers (a-z)
- 2. Yank a whole word from anywhere within a word: `yiw`{normal}
- 3. Change a whole word from anywhere within a word: `ciw`{normal}
- 4. Insert text directly from registers in insert mode: `<CTRL-r>a`{normal}
+ 3. Yank a whole word from anywhere within a word: `yiw`{normal}
+ 4. Change a whole word from anywhere within a word: `ciw`{normal}
+ 5. Insert text directly from registers in insert mode: `<CTRL-R>a`{normal}
- 5. Insert the results of simple arithmetic operations:
- `<CTRL-r>=`{normal}60\*60 `<ENTER>`{normal} in insert mode
- 6. Insert the results of system calls:
- `<CTRL-r>=`{normal}`system('ls -1')`{vim} in insert mode
+ 6. Insert the results of simple arithmetic operations:
+ `<CTRL-r>=`{normal}60\*60`<ENTER>`{normal} in insert mode
+ 7. Insert the results of system calls:
+ `<CTRL-r>=`{normal}`system('ls -1')`{vim}`<ENTER>`{normal} in insert mode
- 7. Inspect registers with `:reg`{vim}
- 8. Learn the final destination of whole line deletions: `dd`{normal} in
+ 8. Inspect registers with `:reg`{vim}
+ 9. Learn the final destination of whole line deletions: `dd`{normal} in
the numbered registers, i.e. descending from register 1 - 9. Appreciate
that whole line deletions are preserved in the numbered registers longer
than any other operation
- 9. Learn the final destination of all yanks in the numbered registers and
+ 10. Learn the final destination of all yanks in the numbered registers and
how ephemeral they are
- 10. Place marks from command mode `m[a-zA-Z0-9]`{normal}
- 11. Move line-wise to a mark with `'`{normal}
+ 11. Place marks from command mode `m[a-zA-Z0-9]`{normal}
+ 12. Move line-wise to a mark with `'`{normal}
+
+ 13. Special registers:
+ - `"+`{normal}/`"*`{normal} - System clipboard (OS dependent)
+ - `"_`{normal} - Blackhole (discard deleted/yanked text)
+ - `"=`{normal} - Expression register
# CONCLUSION
This concludes chapter two of the Vim Tutor. It is a work in progress.
- This chapter was written by Paul D. Parker.
+ This chapter was written by Paul D. Parker and Christian Brabandt.
Modified for vim-tutor-mode by Restorer.
diff --git a/runtime/tutor/en/vim-02-beginner.tutor.json
b/runtime/tutor/en/vim-02-beginner.tutor.json
index 29066ee04..9f80c85db 100644
--- a/runtime/tutor/en/vim-02-beginner.tutor.json
+++ b/runtime/tutor/en/vim-02-beginner.tutor.json
@@ -1,10 +1,15 @@
{
"expect": {
- "36": -1,
- "37": "b) In this capacity, Edward will have sole cookie discretionary
powers",
- "64": "I have forgotten the exact number of seconds in a day, is it 86400",
- "65": -1,
- "91": -1,
- "138": -1
+ "28": -1,
+ "37": -1,
+ "50": -1,
+ "72": -1,
+ "73": "b) In this capacity, Edward will have sole cookie discretionary
powers",
+ "100": "I have forgotten the exact number of seconds in a day, is it
86400",
+ "101": -1,
+ "127": -1,
+ "159": -1,
+ "170": -1,
+ "219": -1
}
}
diff --git a/runtime/tutor/tutor2 b/runtime/tutor/tutor2
index 7c094f17c..ca0de3f03 100644
--- a/runtime/tutor/tutor2
+++ b/runtime/tutor/tutor2
@@ -173,7 +173,7 @@ REFERENCE: Numbered Registers :h quote0
3. Combine with visual selections:
- Select text with V then "+y
- - To paste from clipboard in insert mode: Ctrl-R +
+ - To paste from clipboard in insert mode: <CTRL-R>+
- Try opening another application and paste from clipboard
4. Remember:
@@ -245,7 +245,6 @@ REFERENCE: Marks :h marks
Lesson 2.1 SUMMARY
-
1. Text objects provide precision editing:
- iw/aw - inner/around word
- i[/a[ - inner/around bracket
@@ -258,7 +257,7 @@ REFERENCE: Marks :h marks
26 registers (a-z)
3. Yank a whole word from anywhere within a word: yiw
4. Change a whole word from anywhere within a word: ciw
- 5. Insert text directly from registers in insert mode: (C-r)a
+ 5. Insert text directly from registers in insert mode: <CTRL-R>a
6. Insert the results of simple arithmetic operations: <CTRL-R> followed by
=60*60<ENTER>
@@ -279,14 +278,14 @@ REFERENCE: Marks :h marks
12. Move line-wise to a mark with '
13. Special registers:
- - "+/* - System clipboard (OS dependent)
- - "_ - Blackhole (discard deleted/yanked text)
- - "= - Expression register
+ - "+/"* - System clipboard (OS dependent)
+ - "_ - Blackhole (discard deleted/yanked text)
+ - "= - Expression register
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This concludes chapter two of the Vim Tutor. It is a work in progress.
- This chapter was written by Paul D. Parker.
+ This chapter was written by Paul D. Parker and Christian Brabandt.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1v43Se-005uTp-Fk%40256bit.org.
