From e6ff778030bfb0aca8cc522c3bec2ddd0d5384bf Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Fri, 19 Jan 2024 22:37:22 +0100 Subject: [PATCH 01/38] WIP --- runtime/tutor | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/runtime/tutor b/runtime/tutor index 5892be85fcf4..d2957563c2d8 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1340,6 +1340,79 @@ actions available in a popup. This will allow you to: +================================================================= += CHAPTER 13.1 CREATE NEW SPLIT = +================================================================= + +In normal mode, press ctrl-w (i.e. start pressing ctrl, and +while it is pressed, press w) to open the Window menu. This will +display a pop up that reminds of most window splitting and window +control commands available. + +To open a new empty buffer in a vertical split on the right half +of your current window, you can use ctrl-w nv (i.e., press ctrl +and w at the same time, then press n, then press v). Your current +window will now split in 2 vertically, a new empty buffer split +will appear on the right half, and your cursor will jump to the +new vertical split. + +To create a new empty buffer in an horizontal split, press +ctrl-w ns . This will split your current window in 2 horizontally +and create a new buffer, and your cursor will jump to the new +horizontal split. + + +================================================================= += CHAPTER 13.2 MOVE BETWEEN SPLITS = +================================================================= + +Use ctrl-w k or ctrl-w arrow-up to move to the split above your +current split. Use ctrl-w j or ctrl-w arrow-down to move back +to the split below. + +cursor back to the left split (hjkl or the arrows allow all the +usual movements in window mode). + +You can now do whatever you want in your new buffer (edit, +save, ...). Once you are done with using your new buffer split, +you can close it with ctrl-w q to revert to having a single split +as you had initially. + + + + + + +================================================================= += CHAPTER 13.2 SPLIT CURRENT BUFFER = +================================================================= + +You can also, starting in normal mode, split the view of +the current buffer: try using ctrl-w s (to split half way +horizontally) and ctrl-w v (to split half way vertically). Feel +free to feel moving between the splits you created (ctrl-w hjkl), +closing individual splits, etc. + + + + + + +================================================================= += CHAPTER 13.3 USE COMMANDS TO SPLIT = +================================================================= + +Note that you can also use commands to split, by typing in normal +mode :vsplit (to split the current buffer), or :vsplit FILE_PATH +(to open FILE_PATH into the new split). :vsplit-new is equivalent +to ctrl-w nv , and you can use :hsplit instead of :vsplit to +split horizontally instead. + + + + + + ================================================================= This tutorial is still a work-in-progress. More sections are planned. From 06967b6daee19bdcbf60ac291b4b5fc613b0da96 Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Wed, 24 Jan 2024 21:21:56 +0100 Subject: [PATCH 02/38] WIP --- runtime/tutor | 55 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index d2957563c2d8..ed4a9fcc785c 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1368,30 +1368,38 @@ horizontal split. Use ctrl-w k or ctrl-w arrow-up to move to the split above your current split. Use ctrl-w j or ctrl-w arrow-down to move back -to the split below. +to the split below. Use ctrl-w h or ctrl-w arrow-left to move +to the split left, and ctrl-w l or ctrl-w arrow-right to move +back to the split right. -cursor back to the left split (hjkl or the arrows allow all the -usual movements in window mode). +You can now do whatever you want in your new buffers and splits. -You can now do whatever you want in your new buffer (edit, -save, ...). Once you are done with using your new buffer split, -you can close it with ctrl-w q to revert to having a single split -as you had initially. +Once you are done with using your new buffer split, +you can close it with ctrl-w q . Move to the bottom right split +with ctrl-w l then ctrl-w j, then press ctrl-w q to close this +specific split. + +You can also close all splits except the current one with ctrl-w o . +Open a third vertical split with ctrl-w , then move to the +leftest split with ctrl-w h twice, then from inside the split on +the left press ctrl-w o to close all except this split. + +================================================================= += CHAPTER 13.2 SPLIT CURRENT BUFFER = +================================================================= + +You can also, starting in normal mode, split the view of the +current buffer: use ctrl-w s (to split half way the current +buffer horizontally and open a copy of it on the right too) and +use again ctrl-w v (to split half way vertically with the buffer +opened on both splits). -================================================================= -= CHAPTER 13.2 SPLIT CURRENT BUFFER = -================================================================= -You can also, starting in normal mode, split the view of -the current buffer: try using ctrl-w s (to split half way -horizontally) and ctrl-w v (to split half way vertically). Feel -free to feel moving between the splits you created (ctrl-w hjkl), -closing individual splits, etc. @@ -1402,15 +1410,22 @@ closing individual splits, etc. = CHAPTER 13.3 USE COMMANDS TO SPLIT = ================================================================= -Note that you can also use commands to split, by typing in normal -mode :vsplit (to split the current buffer), or :vsplit FILE_PATH -(to open FILE_PATH into the new split). :vsplit-new is equivalent -to ctrl-w nv , and you can use :hsplit instead of :vsplit to -split horizontally instead. +You can also use the :vsplit (aliased to :vs for convenience) or +the :hsplit (aliased to :hs ) to split vertically or horizontally +a specific buffer. For example, type in the command: +:vs something +to open a new vertical split called something to the right. Here +something is not an existing file, so this will open a new buffer +under this name, but you could replace something with any file name +to open it in a new buffer. Similarly, you can type the command: +:hs some_more +to open a new buffer called some_more in the lower half. Similarly, +some_more could be any file or path to open this specific file or path +instead of a new empty buffer. ================================================================= From ddae958bd77712fd7e23a989a24550a5d76d829c Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Wed, 24 Jan 2024 21:32:38 +0100 Subject: [PATCH 03/38] WIP --- runtime/tutor | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/runtime/tutor b/runtime/tutor index ed4a9fcc785c..c341de367011 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1428,6 +1428,28 @@ some_more could be any file or path to open this specific file or path instead of a new empty buffer. +================================================================= += CHAPTER 13.3 = +================================================================= + + + + + + + + + + + + + + + + + + + ================================================================= This tutorial is still a work-in-progress. More sections are planned. From 518765c3242ae701444d5f589644f0504194b5bc Mon Sep 17 00:00:00 2001 From: JR Date: Sun, 28 Jan 2024 11:14:51 +0100 Subject: [PATCH 04/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index c341de367011..4c42a145e49b 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1344,8 +1344,7 @@ actions available in a popup. This will allow you to: = CHAPTER 13.1 CREATE NEW SPLIT = ================================================================= -In normal mode, press ctrl-w (i.e. start pressing ctrl, and -while it is pressed, press w) to open the Window menu. This will +In normal mode, press ctrl-w to open the Window menu. This will display a pop up that reminds of most window splitting and window control commands available. From ffba9cd40be0666b8ac9302e4d43468643561d26 Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Sun, 28 Jan 2024 11:42:10 +0100 Subject: [PATCH 05/38] WIP --- runtime/tutor | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 4c42a145e49b..67d82e1c90f9 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1361,6 +1361,7 @@ and create a new buffer, and your cursor will jump to the new horizontal split. + ================================================================= = CHAPTER 13.2 MOVE BETWEEN SPLITS = ================================================================= @@ -1369,17 +1370,17 @@ Use ctrl-w k or ctrl-w arrow-up to move to the split above your current split. Use ctrl-w j or ctrl-w arrow-down to move back to the split below. Use ctrl-w h or ctrl-w arrow-left to move to the split left, and ctrl-w l or ctrl-w arrow-right to move -back to the split right. +back to the split right. To move to the next split (in opening +order), press ctrl-w w . You can now do whatever you want in your new buffers and splits. - Once you are done with using your new buffer split, you can close it with ctrl-w q . Move to the bottom right split with ctrl-w l then ctrl-w j, then press ctrl-w q to close this specific split. You can also close all splits except the current one with ctrl-w o . -Open a third vertical split with ctrl-w , then move to the +Open a third vertical split with ctrl-w nv , then move to the leftest split with ctrl-w h twice, then from inside the split on the left press ctrl-w o to close all except this split. @@ -1393,7 +1394,7 @@ buffer horizontally and open a copy of it on the right too) and use again ctrl-w v (to split half way vertically with the buffer opened on both splits). - +Close extra splits with ctrl-w o to come back to a single window. @@ -1428,20 +1429,46 @@ instead of a new empty buffer. ================================================================= -= CHAPTER 13.3 = += CHAPTER 13.3 SWAPPING SPLITS = ================================================================= +Open a split on the left with :vs hello1 , and then a split below +with :hs hello2 . +From hello2, press ctrl-w K to swap with the split above: now, the +split hello2 is on the top, while hello1 is on the bottom. +Still from hello2, press ctrl-w H to swap with teh 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 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 +this split. +================================================================= += CHAPTER 13.3 TRANSPOSE SPLITS = +================================================================= + +Open a split on the left with :vs hello1 , and then a split below +with :vs hello2. +Move to the tutor split, then press ctrl-w t to transpose the +vertical split that was opened from this window: now hello1 and +hello2 and below, rather than on the right, of the tutor. Press +ctrl-w t to transpose back. +Move to the hello1 split, then press ctrl-2 t to transpose the +horizontal split that was opened from this window: now hello2 +is is on the right, rather than below, hello1. Press ctrl-w t to +transpose back. +Move back to the tutor split and press ctrl-w o to close all but +the tutor window. From 8da5e7941d3ecc0c4c5a11ef33e1d7ee0fbeae84 Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Sun, 28 Jan 2024 12:14:25 +0100 Subject: [PATCH 06/38] WIP --- runtime/tutor | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 67d82e1c90f9..45da97e8860f 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1385,7 +1385,7 @@ leftest split with ctrl-w h twice, then from inside the split on the left press ctrl-w o to close all except this split. ================================================================= -= CHAPTER 13.2 SPLIT CURRENT BUFFER = += CHAPTER 13.3 SPLIT CURRENT BUFFER = ================================================================= You can also, starting in normal mode, split the view of the @@ -1407,7 +1407,7 @@ Close extra splits with ctrl-w o to come back to a single window. ================================================================= -= CHAPTER 13.3 USE COMMANDS TO SPLIT = += CHAPTER 13.4 USE COMMANDS TO SPLIT = ================================================================= You can also use the :vsplit (aliased to :vs for convenience) or @@ -1429,7 +1429,7 @@ instead of a new empty buffer. ================================================================= -= CHAPTER 13.3 SWAPPING SPLITS = += CHAPTER 13.5 SWAPPING SPLITS = ================================================================= Open a split on the left with :vs hello1 , and then a split below @@ -1451,7 +1451,7 @@ this split. ================================================================= -= CHAPTER 13.3 TRANSPOSE SPLITS = += CHAPTER 13.6 TRANSPOSE SPLITS = ================================================================= Open a split on the left with :vs hello1 , and then a split below @@ -1472,7 +1472,25 @@ the tutor window. +================================================================= += CHAPTER 13.7 OPEN SPLIT FROM FILEPICKER = +================================================================= + +Splits can also be opened directly from the filepicker. Press +space f to open the filepicker. From there, you can type in text +to perform file lookup with fuzzy matching, and use the arrows +up and down to move the selected file (indicated by the > symbol). +If you want to exit the file picker, press esc . + +Select any file you like in the file picker. You could open it in +the current view by pressing enter (do not do this at present). +But you can also open it in a new split. Press ctrl-v to open +the selected file in a new vertical split. Press space f again, +select any file you want, and press ctrl-s to open it in a +horizontal split. +Move back to the tutor split, and press ctrl-w o to close all +splits except this one. From b10a832dca92d84a8c261184f2deda94f60f90f8 Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Sun, 28 Jan 2024 12:21:35 +0100 Subject: [PATCH 07/38] WIP --- runtime/tutor | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/runtime/tutor b/runtime/tutor index 45da97e8860f..a4c87b471636 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1494,6 +1494,28 @@ splits except this one. +================================================================= += CHAPTER 13 RECAP = +================================================================= + +Splits can be used to display either the same buffer several times, +or several buffers. To access the main windows and splits commands, +press ctrl-w . You can move between splits with ctrl-w hjkl , +you can close a split with ctrl-w q , and you can close all but +the present split with ctrl-w o . + +Splits can also be opened by using the :vs FILENAME and +:hs FILENAME commands. + +Splits can also be used directly from the file pickers, by using +ctrl-v to open the file selected in a new vertical split, and +ctrl-s in a horizontal split. + + + + + + ================================================================= This tutorial is still a work-in-progress. More sections are planned. From bf5b18b59c50d767aa465c59c76a22dcdfd772db Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Sat, 3 Feb 2024 20:29:57 +0100 Subject: [PATCH 08/38] Fix typos --- runtime/tutor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index a4c87b471636..5d5f91d3dbbd 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1381,7 +1381,7 @@ specific split. You can also close all splits except the current one with ctrl-w o . Open a third vertical split with ctrl-w nv , then move to the -leftest split with ctrl-w h twice, then from inside the split on +leftmost split with ctrl-w h twice, then from inside the split on the left press ctrl-w o to close all except this split. ================================================================= @@ -1438,7 +1438,7 @@ with :hs hello2 . From hello2, press ctrl-w K to swap with the split above: now, the split hello2 is on the top, while hello1 is on the bottom. -Still from hello2, press ctrl-w H to swap with teh split on the +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 split with the buffer on the left / below / above / on the right. @@ -1455,16 +1455,16 @@ this split. ================================================================= Open a split on the left with :vs hello1 , and then a split below -with :vs hello2. +with :vs hello2 . Move to the tutor split, then press ctrl-w t to transpose the vertical split that was opened from this window: now hello1 and hello2 and below, rather than on the right, of the tutor. Press ctrl-w t to transpose back. -Move to the hello1 split, then press ctrl-2 t to transpose the +Move to the hello1 split, then press ctrl-w t to transpose the horizontal split that was opened from this window: now hello2 -is is on the right, rather than below, hello1. Press ctrl-w t to +is on the right, rather than below, hello1. Press ctrl-w t to transpose back. Move back to the tutor split and press ctrl-w o to close all but From 46e6fc6d8a35bb22a44a291ac990f7f977378775 Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Sat, 3 Feb 2024 20:38:07 +0100 Subject: [PATCH 09/38] Fix typos --- runtime/tutor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 5d5f91d3dbbd..bdeb020d0ceb 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1344,9 +1344,8 @@ actions available in a popup. This will allow you to: = CHAPTER 13.1 CREATE NEW SPLIT = ================================================================= -In normal mode, press ctrl-w to open the Window menu. This will -display a pop up that reminds of most window splitting and window -control commands available. +In normal mode, press ctrl-w to open the Window menu, and display +a list of available commands. To open a new empty buffer in a vertical split on the right half of your current window, you can use ctrl-w nv (i.e., press ctrl @@ -1362,6 +1361,7 @@ horizontal split. + ================================================================= = CHAPTER 13.2 MOVE BETWEEN SPLITS = ================================================================= From a04d57aae8ed7d4b6e35243f23273415f0032c5e Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Sun, 4 Feb 2024 22:25:04 +0100 Subject: [PATCH 10/38] Minor updates --- runtime/tutor | 70 +++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index bdeb020d0ceb..81cf22732cfa 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1344,18 +1344,18 @@ actions available in a popup. This will allow you to: = CHAPTER 13.1 CREATE NEW SPLIT = ================================================================= -In normal mode, press ctrl-w to open the Window menu, and display +In normal mode, press Ctrl-w to open the Window menu, and display a list of available commands. To open a new empty buffer in a vertical split on the right half -of your current window, you can use ctrl-w nv (i.e., press ctrl +of your current window, you can use Ctrl-w nv (i.e., press Ctrl and w at the same time, then press n, then press v). Your current window will now split in 2 vertically, a new empty buffer split will appear on the right half, and your cursor will jump to the new vertical split. To create a new empty buffer in an horizontal split, press -ctrl-w ns . This will split your current window in 2 horizontally +Ctrl-w ns . This will split your current window in 2 horizontally and create a new buffer, and your cursor will jump to the new horizontal split. @@ -1366,35 +1366,35 @@ horizontal split. = CHAPTER 13.2 MOVE BETWEEN SPLITS = ================================================================= -Use ctrl-w k or ctrl-w arrow-up to move to the split above your -current split. Use ctrl-w j or ctrl-w arrow-down to move back -to the split below. Use ctrl-w h or ctrl-w arrow-left to move -to the split left, and ctrl-w l or ctrl-w arrow-right to move +Use Ctrl-w k or Ctrl-w arrow-up to move to the split above your +current split. Use Ctrl-w j or Ctrl-w arrow-down to move back +to the split below. Use Ctrl-w h or Ctrl-w arrow-left to move +to the split left, and Ctrl-w l or Ctrl-w arrow-right to move back to the split right. To move to the next split (in opening -order), press ctrl-w w . +order), press Ctrl-w w . You can now do whatever you want in your new buffers and splits. Once you are done with using your new buffer split, -you can close it with ctrl-w q . Move to the bottom right split -with ctrl-w l then ctrl-w j, then press ctrl-w q to close this +you can close it with Ctrl-w q . Move to the bottom right split +with Ctrl-w l then Ctrl-w j, then press Ctrl-w q to close this specific split. -You can also close all splits except the current one with ctrl-w o . -Open a third vertical split with ctrl-w nv , then move to the -leftmost split with ctrl-w h twice, then from inside the split on -the left press ctrl-w o to close all except this split. +You can also close all splits except the current one with Ctrl-w o . +Open a third vertical split with Ctrl-w nv , then move to the +leftmost split with Ctrl-w h twice, then from inside the split on +the left press Ctrl-w o to close all except this split. ================================================================= = CHAPTER 13.3 SPLIT CURRENT BUFFER = ================================================================= You can also, starting in normal mode, split the view of the -current buffer: use ctrl-w s (to split half way the current +current buffer: use Ctrl-w s (to split half way the current buffer horizontally and open a copy of it on the right too) and -use again ctrl-w v (to split half way vertically with the buffer +use again Ctrl-w v (to split half way vertically with the buffer opened on both splits). -Close extra splits with ctrl-w o to come back to a single window. +Close extra splits with Ctrl-w o to come back to a single window. @@ -1435,15 +1435,15 @@ instead of a new empty buffer. Open a split on the left with :vs hello1 , and then a split below with :hs hello2 . -From hello2, press ctrl-w K to swap with the split above: now, the +From hello2, press Ctrl-w K to swap with the split above: now, the split hello2 is on the top, while hello1 is on the bottom. -Still from hello2, press ctrl-w H to swap with the split on the +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 split 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 +Move back to the tutor split, and press Ctrl-w o to only keep this split. @@ -1457,17 +1457,17 @@ this split. Open a split on the left with :vs hello1 , and then a split below with :vs hello2 . -Move to the tutor split, then press ctrl-w t to transpose the +Move to the tutor split, then press Ctrl-w t to transpose the vertical split that was opened from this window: now hello1 and hello2 and below, rather than on the right, of the tutor. Press -ctrl-w t to transpose back. +Ctrl-w t to transpose back. -Move to the hello1 split, then press ctrl-w t to transpose the +Move to the hello1 split, then press Ctrl-w t to transpose the horizontal split that was opened from this window: now hello2 -is on the right, rather than below, hello1. Press ctrl-w t to +is on the right, rather than below, hello1. Press Ctrl-w t to transpose back. -Move back to the tutor split and press ctrl-w o to close all but +Move back to the tutor split and press Ctrl-w o to close all but the tutor window. @@ -1480,16 +1480,16 @@ Splits can also be opened directly from the filepicker. Press space f to open the filepicker. From there, you can type in text to perform file lookup with fuzzy matching, and use the arrows up and down to move the selected file (indicated by the > symbol). -If you want to exit the file picker, press esc . +If you want to exit the file picker, press Escape. Select any file you like in the file picker. You could open it in the current view by pressing enter (do not do this at present). -But you can also open it in a new split. Press ctrl-v to open +But you can also open it in a new split. Press Ctrl-v to open the selected file in a new vertical split. Press space f again, -select any file you want, and press ctrl-s to open it in a +select any file you want, and press Ctrl-s to open it in a horizontal split. -Move back to the tutor split, and press ctrl-w o to close all +Move back to the tutor split, and press Ctrl-w o to close all splits except this one. @@ -1500,16 +1500,16 @@ splits except this one. Splits can be used to display either the same buffer several times, or several buffers. To access the main windows and splits commands, -press ctrl-w . You can move between splits with ctrl-w hjkl , -you can close a split with ctrl-w q , and you can close all but -the present split with ctrl-w o . +press Ctrl-w . You can move between splits with Ctrl-w hjkl , +you can close a split with Ctrl-w q , and you can close all but +the present split with Ctrl-w o . Splits can also be opened by using the :vs FILENAME and :hs FILENAME commands. Splits can also be used directly from the file pickers, by using -ctrl-v to open the file selected in a new vertical split, and -ctrl-s in a horizontal split. +Ctrl-v to open the file selected in a new vertical split, and +Ctrl-s in a horizontal split. From 1db25eaf13168949d6285e3f258ea76b76da15d9 Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:43:10 +0100 Subject: [PATCH 11/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index 81cf22732cfa..2c4c7cdb836f 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1432,7 +1432,7 @@ instead of a new empty buffer. = CHAPTER 13.5 SWAPPING SPLITS = ================================================================= -Open a split on the left with :vs hello1 , and then a split below +Open a split on the left with :vs hello1 and then a split below with :hs hello2 . From hello2, press Ctrl-w K to swap with the split above: now, the From f85cd701847b3c3aaf5b3549007f1b18a5da2313 Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:43:24 +0100 Subject: [PATCH 12/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 2c4c7cdb836f..5deb757af8ab 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1435,8 +1435,8 @@ instead of a new empty buffer. Open a split on the left with :vs hello1 and then a split below with :hs hello2 . -From hello2, press Ctrl-w K to swap with the split above: now, the -split hello2 is on the top, while hello1 is on the bottom. +From hello2, press Ctrl-w K to swap with the split above. Now the +split hello2 is on the top while hello1 is on the bottom. 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 From c24a9920cd29593b0adbacf61f672447dd1877ca Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:43:46 +0100 Subject: [PATCH 13/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index 5deb757af8ab..350249d95c36 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1454,7 +1454,7 @@ this split. = CHAPTER 13.6 TRANSPOSE SPLITS = ================================================================= -Open a split on the left with :vs hello1 , and then a split below +Open a split on the left with :vs hello1 and then a split below with :vs hello2 . Move to the tutor split, then press Ctrl-w t to transpose the From 9dc1ffd20e8ecf99ccf23f2afb0b9d7a287057e2 Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:43:58 +0100 Subject: [PATCH 14/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index 350249d95c36..c65b09d8adbd 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1423,7 +1423,7 @@ to open it in a new buffer. Similarly, you can type the command: :hs some_more -to open a new buffer called some_more in the lower half. Similarly, +to open a new buffer called some_more in the lower half. some_more could be any file or path to open this specific file or path instead of a new empty buffer. From ea78b6f9a680cb9cb62b85c69cd275f3b0cd0ec0 Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:44:12 +0100 Subject: [PATCH 15/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index c65b09d8adbd..7f59810bc50b 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1391,7 +1391,7 @@ the left press Ctrl-w o to close all except this split. You can also, starting in normal mode, split the view of the current buffer: use Ctrl-w s (to split half way the current buffer horizontally and open a copy of it on the right too) and -use again Ctrl-w v (to split half way vertically with the buffer +again use Ctrl-w v (to split half way vertically with the buffer opened on both splits). Close extra splits with Ctrl-w o to come back to a single window. From 357faf88dfa4b901f9f096ed57d92cfc959c5c66 Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:44:37 +0100 Subject: [PATCH 16/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index 7f59810bc50b..8f4413f68a31 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1344,7 +1344,7 @@ actions available in a popup. This will allow you to: = CHAPTER 13.1 CREATE NEW SPLIT = ================================================================= -In normal mode, press Ctrl-w to open the Window menu, and display +In normal mode, press Ctrl-w to open the Window menu and display a list of available commands. To open a new empty buffer in a vertical split on the right half From 2b65b4b80eccb8511ecc2ac82a23f290c66524f9 Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:49:42 +0100 Subject: [PATCH 17/38] Remove mention of arrows in split tutorial --- runtime/tutor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 8f4413f68a31..f730a5007e29 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1366,12 +1366,10 @@ horizontal split. = CHAPTER 13.2 MOVE BETWEEN SPLITS = ================================================================= -Use Ctrl-w k or Ctrl-w arrow-up to move to the split above your -current split. Use Ctrl-w j or Ctrl-w arrow-down to move back -to the split below. Use Ctrl-w h or Ctrl-w arrow-left to move -to the split left, and Ctrl-w l or Ctrl-w arrow-right to move -back to the split right. To move to the next split (in opening -order), press Ctrl-w w . +Use Ctrl-w k to move to the split above your current split. Use +Ctrl-w j to move back to the split below. Use Ctrl-w h to move to +the split left, and Ctrl-w l to move back to the split right. To +move to the next split (in opening order), press Ctrl-w w . You can now do whatever you want in your new buffers and splits. Once you are done with using your new buffer split, @@ -1384,6 +1382,8 @@ Open a third vertical split with Ctrl-w nv , then move to the leftmost split with Ctrl-w h twice, then from inside the split on the left press Ctrl-w o to close all except this split. + + ================================================================= = CHAPTER 13.3 SPLIT CURRENT BUFFER = ================================================================= From 93cf252271d618725a5c446819dc55a3b939f6bc Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:50:53 +0100 Subject: [PATCH 18/38] Do not mention starting in normal mode --- runtime/tutor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index f730a5007e29..687c817b1233 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1388,11 +1388,10 @@ the left press Ctrl-w o to close all except this split. = CHAPTER 13.3 SPLIT CURRENT BUFFER = ================================================================= -You can also, starting in normal mode, split the view of the -current buffer: use Ctrl-w s (to split half way the current -buffer horizontally and open a copy of it on the right too) and -again use Ctrl-w v (to split half way vertically with the buffer -opened on both splits). +You can also split the view of the current buffer: use Ctrl-w +s (to split half way the current buffer horizontally and open +a copy of it on the right too) and again use Ctrl-w v (to split +half way vertically with the buffer opened on both splits). Close extra splits with Ctrl-w o to come back to a single window. @@ -1406,6 +1405,7 @@ Close extra splits with Ctrl-w o to come back to a single window. + ================================================================= = CHAPTER 13.4 USE COMMANDS TO SPLIT = ================================================================= From 587909e9aae3efcf888b3fc09cf1aa3acfeff9df Mon Sep 17 00:00:00 2001 From: JR Date: Mon, 12 Feb 2024 10:55:30 +0100 Subject: [PATCH 19/38] Fix right drift of titles --- runtime/tutor | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 687c817b1233..2e8a836155ca 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1209,7 +1209,7 @@ move to ], and press mm to jump to [ . ================================================================= -= 12.2 USING MATCH MODE SELECT INSIDE = += 12.2 USING MATCH MODE SELECT INSIDE = ================================================================= Match mode also lets you select the "inside" content between a @@ -1231,7 +1231,7 @@ surrounding matching pair). This also works with "" and similar --> try ( with nested [ pairs of ( parenthesis) and "brackets" ]) ================================================================= -= 12.3 USING MATCH MODE SELECT AROUND = += 12.3 USING MATCH MODE SELECT AROUND = ================================================================= You can also select the "around" content, i.e. both the inside @@ -1253,7 +1253,7 @@ This naturally works with other delimiters too: ================================================================= -= 12.4 USING MATCH MODE SURROUND = += 12.4 USING MATCH MODE SURROUND = ================================================================= The match mode can also be used to add surrounding around the @@ -1275,7 +1275,7 @@ with adding a surrounding pair of "", or {}, or []. ================================================================= -= 12.5 USING MATCH MODE DELETE SURROUND = += 12.5 USING MATCH MODE DELETE SURROUND = ================================================================= You can delete surrounding pair of delimiters with the md @@ -1297,7 +1297,7 @@ Trying to delete unexisting surrounding delimiters print an error at the bottom bar and does nothing. ================================================================= -= 12.6 USING MATCH MODE REPLACE SURROUND = += 12.6 USING MATCH MODE REPLACE SURROUND = ================================================================= You can replace surrounding pairs of delimiters with the mr @@ -1319,7 +1319,7 @@ an error warning at the bottom bar and do nothing. ================================================================= -= CHAPTER 12 RECAP = += CHAPTER 12 RECAP = ================================================================= You can enter the match mode with the m key; this will show the @@ -1341,7 +1341,7 @@ actions available in a popup. This will allow you to: ================================================================= -= CHAPTER 13.1 CREATE NEW SPLIT = += CHAPTER 13.1 CREATE NEW SPLIT = ================================================================= In normal mode, press Ctrl-w to open the Window menu and display @@ -1363,7 +1363,7 @@ horizontal split. ================================================================= -= CHAPTER 13.2 MOVE BETWEEN SPLITS = += CHAPTER 13.2 MOVE BETWEEN SPLITS = ================================================================= Use Ctrl-w k to move to the split above your current split. Use @@ -1385,7 +1385,7 @@ the left press Ctrl-w o to close all except this split. ================================================================= -= CHAPTER 13.3 SPLIT CURRENT BUFFER = += CHAPTER 13.3 SPLIT CURRENT BUFFER = ================================================================= You can also split the view of the current buffer: use Ctrl-w @@ -1407,7 +1407,7 @@ Close extra splits with Ctrl-w o to come back to a single window. ================================================================= -= CHAPTER 13.4 USE COMMANDS TO SPLIT = += CHAPTER 13.4 USE COMMANDS TO SPLIT = ================================================================= You can also use the :vsplit (aliased to :vs for convenience) or @@ -1429,7 +1429,7 @@ instead of a new empty buffer. ================================================================= -= CHAPTER 13.5 SWAPPING SPLITS = += CHAPTER 13.5 SWAPPING SPLITS = ================================================================= Open a split on the left with :vs hello1 and then a split below @@ -1451,7 +1451,7 @@ this split. ================================================================= -= CHAPTER 13.6 TRANSPOSE SPLITS = += CHAPTER 13.6 TRANSPOSE SPLITS = ================================================================= Open a split on the left with :vs hello1 and then a split below @@ -1473,7 +1473,7 @@ the tutor window. ================================================================= -= CHAPTER 13.7 OPEN SPLIT FROM FILEPICKER = += CHAPTER 13.7 OPEN SPLIT FROM FILEPICKER = ================================================================= Splits can also be opened directly from the filepicker. Press @@ -1495,7 +1495,7 @@ splits except this one. ================================================================= -= CHAPTER 13 RECAP = += CHAPTER 13 RECAP = ================================================================= Splits can be used to display either the same buffer several times, From 8aa30d1555a900fc9f390547045e3ef34a8baaf5 Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 17:56:06 +0100 Subject: [PATCH 20/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index 2e8a836155ca..efc54eb684e0 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1344,7 +1344,7 @@ actions available in a popup. This will allow you to: = CHAPTER 13.1 CREATE NEW SPLIT = ================================================================= -In normal mode, press Ctrl-w to open the Window menu and display +In Normal mode, press Ctrl-w to open the Window menu, which displays a list of available commands. To open a new empty buffer in a vertical split on the right half From a065c580e3fafd047e9c3944b9ded4e19e4c694a Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 17:56:41 +0100 Subject: [PATCH 21/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index efc54eb684e0..eb4b8545512c 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1348,8 +1348,8 @@ In Normal mode, press Ctrl-w to open the Window menu, which displays a list of available commands. To open a new empty buffer in a vertical split on the right half -of your current window, you can use Ctrl-w nv (i.e., press Ctrl -and w at the same time, then press n, then press v). Your current +of your current window, use Ctrl-w nv (i.e., press Ctrl +and w simultaneously, then press n, followed by v). Your current window will now split in 2 vertically, a new empty buffer split will appear on the right half, and your cursor will jump to the new vertical split. From f6ac52c8376f5d15c1a6eef3a3dfbd31154e7667 Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 17:58:54 +0100 Subject: [PATCH 22/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index eb4b8545512c..acbed59012c2 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1354,9 +1354,9 @@ window will now split in 2 vertically, a new empty buffer split will appear on the right half, and your cursor will jump to the new vertical split. -To create a new empty buffer in an horizontal split, press -Ctrl-w ns . This will split your current window in 2 horizontally -and create a new buffer, and your cursor will jump to the new +To create a new empty buffer in a horizontal split, press +Ctrl-w ns. This action divides your current window into two horizontally, +creates a new buffer, and moves your cursor to the new horizontal split. From 49d391b3379f81ef3937d91b196c473fe3bef7eb Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 17:59:15 +0100 Subject: [PATCH 23/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index acbed59012c2..e1bc25379ac0 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1367,9 +1367,9 @@ horizontal split. ================================================================= Use Ctrl-w k to move to the split above your current split. Use -Ctrl-w j to move back to the split below. Use Ctrl-w h to move to -the split left, and Ctrl-w l to move back to the split right. To -move to the next split (in opening order), press Ctrl-w w . +Ctrl-w j to move to the split below. Use Ctrl-w h to move to the +split on the left, and Ctrl-w l to move to the split on the right. To +navigate to the next split (in the order they were opened), press Ctrl-w w. You can now do whatever you want in your new buffers and splits. Once you are done with using your new buffer split, From dff604a203d38114b46d2c52df0ccc76f1e8b1e1 Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 18:04:43 +0100 Subject: [PATCH 24/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index e1bc25379ac0..993b5654a2f0 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1388,12 +1388,12 @@ the left press Ctrl-w o to close all except this split. = CHAPTER 13.3 SPLIT CURRENT BUFFER = ================================================================= -You can also split the view of the current buffer: use Ctrl-w -s (to split half way the current buffer horizontally and open -a copy of it on the right too) and again use Ctrl-w v (to split -half way vertically with the buffer opened on both splits). +To split the view of the current buffer, use Ctrl-w s to split it +horizontally and open a copy on the right, and Ctrl-w v to split it +vertically with the buffer opened in both splits. + +Close extra splits with Ctrl-w o to return to a single window view. -Close extra splits with Ctrl-w o to come back to a single window. From 2d5d8c59e8b4b3beb89819ef20cf29033ada2733 Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 18:07:07 +0100 Subject: [PATCH 25/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 993b5654a2f0..17de870b1d9a 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1410,9 +1410,9 @@ Close extra splits with Ctrl-w o to return to a single window view. = CHAPTER 13.4 USE COMMANDS TO SPLIT = ================================================================= -You can also use the :vsplit (aliased to :vs for convenience) or -the :hsplit (aliased to :hs ) to split vertically or horizontally -a specific buffer. For example, type in the command: +The :vsplit (or :vs for short) and :hsplit (or :hs) commands can +also be used to split a specific buffer vertically or horizontally. For example, enter the command: + :vs something From 4868fdec08f19534dd49ab991dbc206b7ea11624 Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 18:07:33 +0100 Subject: [PATCH 26/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 17de870b1d9a..1558f8b329a0 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1416,10 +1416,10 @@ also be used to split a specific buffer vertically or horizontally. For example, :vs something -to open a new vertical split called something to the right. Here -something is not an existing file, so this will open a new buffer -under this name, but you could replace something with any file name -to open it in a new buffer. Similarly, you can type the command: +to open a new vertical split named "something" to the right. Here, +"something" is not an existing file, so a new buffer with this name +will open; however, you can replace "something" with any file name +to open it in a new buffer. Similarly, you can enter the command: :hs some_more From e6cbf43a804a8560bc161dbca224dc00d40c6d5f Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 18:07:47 +0100 Subject: [PATCH 27/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 1558f8b329a0..daa75f894fd6 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1423,8 +1423,8 @@ to open it in a new buffer. Similarly, you can enter the command: :hs some_more -to open a new buffer called some_more in the lower half. -some_more could be any file or path to open this specific file or path +to open a new buffer named "some_more" in the lower half. +"some_more" could be any file or path to open this specific file or path instead of a new empty buffer. From 467bfeb3a7675d3072e691b02b1f046430be5ff6 Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 18:08:06 +0100 Subject: [PATCH 28/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index daa75f894fd6..b31a555011a9 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1433,10 +1433,10 @@ instead of a new empty buffer. ================================================================= Open a split on the left with :vs hello1 and then a split below -with :hs hello2 . +with :hs hello2. -From hello2, press Ctrl-w K to swap with the split above. Now the -split hello2 is on the top while hello1 is on the bottom. +From hello2, press Ctrl-w K to swap it with the split above. Now, +hello2 is at the top, while hello1 is at the bottom. 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 From baf347bc5c0b229ae38a3e9503f0359b4f8fde30 Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 18:08:18 +0100 Subject: [PATCH 29/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index b31a555011a9..1fe6edd98716 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1455,7 +1455,7 @@ this split. ================================================================= Open a split on the left with :vs hello1 and then a split below -with :vs hello2 . +with :vs hello2. Move to the tutor split, then press Ctrl-w t to transpose the vertical split that was opened from this window: now hello1 and From f99356dfe7e72e95e436c69afbe46435242b4c44 Mon Sep 17 00:00:00 2001 From: JR Date: Sat, 2 Mar 2024 18:08:37 +0100 Subject: [PATCH 30/38] Update runtime/tutor Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com> --- runtime/tutor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 1fe6edd98716..2e33b647db48 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1458,9 +1458,9 @@ Open a split on the left with :vs hello1 and then a split below with :vs hello2. Move to the tutor split, then press Ctrl-w t to transpose the -vertical split that was opened from this window: now hello1 and -hello2 and below, rather than on the right, of the tutor. Press -Ctrl-w t to transpose back. +vertical split opened from this window: now, hello1 and +hello2 are below, rather than to the right of, the tutor. Press +Ctrl-w t again to transpose back. Move to the hello1 split, then press Ctrl-w t to transpose the horizontal split that was opened from this window: now hello2 From b4593952b5fe61ed483d63029e39de7bd5638a6f Mon Sep 17 00:00:00 2001 From: jerabaul29 Date: Sat, 2 Mar 2024 18:13:53 +0100 Subject: [PATCH 31/38] Reflow paragraphs --- runtime/tutor | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 2e33b647db48..7f5270056d8f 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1355,9 +1355,9 @@ will appear on the right half, and your cursor will jump to the new vertical split. To create a new empty buffer in a horizontal split, press -Ctrl-w ns. This action divides your current window into two horizontally, -creates a new buffer, and moves your cursor to the new -horizontal split. +Ctrl-w ns. This action divides your current window into two +horizontally, creates a new buffer, and moves your cursor to the +new horizontal split. @@ -1367,9 +1367,10 @@ horizontal split. ================================================================= Use Ctrl-w k to move to the split above your current split. Use -Ctrl-w j to move to the split below. Use Ctrl-w h to move to the -split on the left, and Ctrl-w l to move to the split on the right. To -navigate to the next split (in the order they were opened), press Ctrl-w w. +Ctrl-w j to move to the split below. Use Ctrl-w h to move to +the split on the left, and Ctrl-w l to move to the split on the +right. To navigate to the next split (in the order they were +opened), press Ctrl-w w. You can now do whatever you want in your new buffers and splits. Once you are done with using your new buffer split, @@ -1383,7 +1384,6 @@ leftmost split with Ctrl-w h twice, then from inside the split on the left press Ctrl-w o to close all except this split. - ================================================================= = CHAPTER 13.3 SPLIT CURRENT BUFFER = ================================================================= @@ -1411,8 +1411,8 @@ Close extra splits with Ctrl-w o to return to a single window view. ================================================================= The :vsplit (or :vs for short) and :hsplit (or :hs) commands can -also be used to split a specific buffer vertically or horizontally. For example, enter the command: - +also be used to split a specific buffer vertically or horizontally. +For example, enter the command: :vs something @@ -1424,8 +1424,8 @@ to open it in a new buffer. Similarly, you can enter the command: :hs some_more to open a new buffer named "some_more" in the lower half. -"some_more" could be any file or path to open this specific file or path -instead of a new empty buffer. +"some_more" could be any file or path to open this specific file +or path instead of a new empty buffer. ================================================================= From 6c1338423db0efb24cbc62609fd79087ce9589b9 Mon Sep 17 00:00:00 2001 From: JR Date: Thu, 21 Mar 2024 09:03:01 +0100 Subject: [PATCH 32/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 7f5270056d8f..2e8a88fe02e3 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1476,8 +1476,8 @@ the tutor window. = CHAPTER 13.7 OPEN SPLIT FROM FILEPICKER = ================================================================= -Splits can also be opened directly from the filepicker. Press -space f to open the filepicker. From there, you can type in text +Splits can also be opened directly from the file picker. Press +space f to open the file picker. From there, you can type in text to perform file lookup with fuzzy matching, and use the arrows up and down to move the selected file (indicated by the > symbol). If you want to exit the file picker, press Escape. From 24308fc90f04da2483dee44243c57122f109a86e Mon Sep 17 00:00:00 2001 From: JR Date: Thu, 21 Mar 2024 09:03:21 +0100 Subject: [PATCH 33/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index 2e8a88fe02e3..d1233a92fafc 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1498,7 +1498,7 @@ splits except this one. = CHAPTER 13 RECAP = ================================================================= -Splits can be used to display either the same buffer several times, +Splits can be used to display either the same buffer several times or several buffers. To access the main windows and splits commands, press Ctrl-w . You can move between splits with Ctrl-w hjkl , you can close a split with Ctrl-w q , and you can close all but From 4ac36549718957a617ff1ca7a13e10202122b0aa Mon Sep 17 00:00:00 2001 From: JR Date: Thu, 21 Mar 2024 09:03:36 +0100 Subject: [PATCH 34/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index d1233a92fafc..d53a88df8ba4 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1435,8 +1435,8 @@ or path instead of a new empty buffer. Open a split on the left with :vs hello1 and then a split below with :hs hello2. -From hello2, press Ctrl-w K to swap it with the split above. Now, -hello2 is at the top, while hello1 is at the bottom. +From hello2, press Ctrl-w K to swap it with the split above. Now +hello2 is at the top while hello1 is at the bottom. 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 From b72c235b2e49a89e1ddabc12491494935ddd1150 Mon Sep 17 00:00:00 2001 From: JR Date: Thu, 21 Mar 2024 09:03:54 +0100 Subject: [PATCH 35/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index d53a88df8ba4..249bbea09d15 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1439,8 +1439,8 @@ From hello2, press Ctrl-w K to swap it with the split above. Now hello2 is at the top while hello1 is at the bottom. 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 split with the buffer +left: now hello2 is on the left and the tutor is on the top +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 From 4289079fbb3188d2cced1abaf844722367848c82 Mon Sep 17 00:00:00 2001 From: JR Date: Thu, 21 Mar 2024 09:04:13 +0100 Subject: [PATCH 36/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 249bbea09d15..3152fff90728 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1388,9 +1388,9 @@ the left press Ctrl-w o to close all except this split. = CHAPTER 13.3 SPLIT CURRENT BUFFER = ================================================================= -To split the view of the current buffer, use Ctrl-w s to split it -horizontally and open a copy on the right, and Ctrl-w v to split it -vertically with the buffer opened in both splits. +Use Ctrl-w s to split the view of the current buffer horizontally +and Ctrl-w v to split it vertically with the buffer opened in both +splits. Close extra splits with Ctrl-w o to return to a single window view. From cb5154c5685cf9b7e885ba3cda13fb12cc1b5949 Mon Sep 17 00:00:00 2001 From: JR Date: Thu, 21 Mar 2024 09:04:30 +0100 Subject: [PATCH 37/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/tutor b/runtime/tutor index 3152fff90728..292e8dbdda12 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1368,7 +1368,7 @@ new horizontal split. Use Ctrl-w k to move to the split above your current split. Use Ctrl-w j to move to the split below. Use Ctrl-w h to move to -the split on the left, and Ctrl-w l to move to the split on the +the split on the left and Ctrl-w l to move to the split on the right. To navigate to the next split (in the order they were opened), press Ctrl-w w. From c7f858fba0e7b92c4aabe5fb69420c9c8950920c Mon Sep 17 00:00:00 2001 From: JR Date: Thu, 21 Mar 2024 09:04:55 +0100 Subject: [PATCH 38/38] Update runtime/tutor Co-authored-by: Michael Davis --- runtime/tutor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tutor b/runtime/tutor index 292e8dbdda12..f2535dd92ac1 100644 --- a/runtime/tutor +++ b/runtime/tutor @@ -1350,8 +1350,8 @@ a list of available commands. To open a new empty buffer in a vertical split on the right half of your current window, use Ctrl-w nv (i.e., press Ctrl and w simultaneously, then press n, followed by v). Your current -window will now split in 2 vertically, a new empty buffer split -will appear on the right half, and your cursor will jump to the +window will now split in 2 vertically. A new empty buffer split +will appear on the right half and your cursor will jump to the new vertical split. To create a new empty buffer in a horizontal split, press