Merge pull request #108 from pit-ray/add-89 (close #89, close #100)

Add autocmd
pit-ray · Aug 11, 2023 · 650b532 · 650b532
2 parents 2abfd80 + d215fe9
commit 650b532
Show file tree

Hide file tree

Showing 58 changed files with 1,241 additions and 403 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,7 @@
 .vimspector.json
 .vs
 .vscode
-:w
-:wq
+:*
 Testing
 bin
 bin_32
@@ -24,8 +23,8 @@ debug
 debug_cov
 debugvs
 debugvs32
-is_initialized
 log
+manifests
 release
 release_32
 release_64
@@ -36,5 +35,4 @@ tmp
 venv
 w
 winget
-manifests
 wingetcreate.exe
diff --git a/docs/cheat_sheet/defaults/big/index.md b/docs/cheat_sheet/defaults/big/index.md
@@ -19,10 +19,10 @@ nav: Big Mappings
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
 |`V`|[\<select_all\>]({{ site.url }}/cheat_sheet/functions/#select_all)|
-|`y`, `Y`, `yy`|[\<hotkey_copy\>]({{ site.url }}/cheat_sheet/functions/#hotkey_copy)|
+|`yy`, `y`, `Y`|[\<hotkey_copy\>]({{ site.url }}/cheat_sheet/functions/#hotkey_copy)|
 |`p`, `P`|[\<hotkey_paste\>]({{ site.url }}/cheat_sheet/functions/#hotkey_paste)|
 |`dd`, `D`|[\<hotkey_cut\>]({{ site.url }}/cheat_sheet/functions/#hotkey_cut)|
-|`<Del>`, `x`|[\<hotkey_delete\>]({{ site.url }}/cheat_sheet/functions/#hotkey_delete)|
+|`x`, `<Del>`|[\<hotkey_delete\>]({{ site.url }}/cheat_sheet/functions/#hotkey_delete)|
 |`X`|[\<hotkey_backspace\>]({{ site.url }}/cheat_sheet/functions/#hotkey_backspace)|
 |`<C-r>`|[\<redo\>]({{ site.url }}/cheat_sheet/functions/#redo)|
 |`u`, `U`|[\<undo\>]({{ site.url }}/cheat_sheet/functions/#undo)|
@@ -51,17 +51,17 @@ nav: Big Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`<Left>`, `h`, `<BS>`|[\<move_cursor_left\>]({{ site.url }}/cheat_sheet/functions/#move_cursor_left)|
-|`<Right>`, `l`, `<Space>`|[\<move_cursor_right\>]({{ site.url }}/cheat_sheet/functions/#move_cursor_right)|
-|`k`, `-`, `<Up>`|[\<move_cursor_up\>]({{ site.url }}/cheat_sheet/functions/#move_cursor_up)|
-|`+`, `<Down>`, `j`|[\<move_cursor_down\>]({{ site.url }}/cheat_sheet/functions/#move_cursor_down)|
+|`h`, `<Left>`, `<BS>`|[\<move_cursor_left\>]({{ site.url }}/cheat_sheet/functions/#move_cursor_left)|
+|`l`, `<Right>`, `<Space>`|[\<move_cursor_right\>]({{ site.url }}/cheat_sheet/functions/#move_cursor_right)|
+|`-`, `<Up>`, `k`|[\<move_cursor_up\>]({{ site.url }}/cheat_sheet/functions/#move_cursor_up)|
+|`<Down>`, `+`, `j`|[\<move_cursor_down\>]({{ site.url }}/cheat_sheet/functions/#move_cursor_down)|
 
 ### Mouse Jumping
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`<Home>`, `0`, `^`|[\<jump_cursor_to_left\>]({{ site.url }}/cheat_sheet/functions/#jump_cursor_to_left)|
-|`$`, `<End>`|[\<jump_cursor_to_right\>]({{ site.url }}/cheat_sheet/functions/#jump_cursor_to_right)|
+|`<Home>`, `^`, `0`|[\<jump_cursor_to_left\>]({{ site.url }}/cheat_sheet/functions/#jump_cursor_to_left)|
+|`<End>`, `$`|[\<jump_cursor_to_right\>]({{ site.url }}/cheat_sheet/functions/#jump_cursor_to_right)|
 |`gg`|[\<jump_cursor_to_top\>]({{ site.url }}/cheat_sheet/functions/#jump_cursor_to_top)|
 |`G`|[\<jump_cursor_to_bottom\>]({{ site.url }}/cheat_sheet/functions/#jump_cursor_to_bottom)|
 |`gm`|[\<jump_cursor_to_hcenter\>]({{ site.url }}/cheat_sheet/functions/#jump_cursor_to_hcenter)|
@@ -72,12 +72,12 @@ nav: Big Mappings
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
 |`<C-y>`, `<C-k>`|[\<scroll_up\>]({{ site.url }}/cheat_sheet/functions/#scroll_up)|
-|`<C-e>`, `<C-j>`|[\<scroll_down\>]({{ site.url }}/cheat_sheet/functions/#scroll_down)|
+|`<C-j>`, `<C-e>`|[\<scroll_down\>]({{ site.url }}/cheat_sheet/functions/#scroll_down)|
 |`<C-u>`|[\<scroll_up_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_up_halfpage)|
 |`<C-d>`|[\<scroll_down_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_down_halfpage)|
 |`<C-b>`|[\<scroll_up_onepage\>]({{ site.url }}/cheat_sheet/functions/#scroll_up_onepage)|
 |`<C-f>`|[\<scroll_down_onepage\>]({{ site.url }}/cheat_sheet/functions/#scroll_down_onepage)|
-|`<C-h>`, `zh`|[\<scroll_left\>]({{ site.url }}/cheat_sheet/functions/#scroll_left)|
+|`zh`, `<C-h>`|[\<scroll_left\>]({{ site.url }}/cheat_sheet/functions/#scroll_left)|
 |`<C-l>`, `zl`|[\<scroll_right\>]({{ site.url }}/cheat_sheet/functions/#scroll_right)|
 |`zH`|[\<scroll_left_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_left_halfpage)|
 |`zL`|[\<scroll_right_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_right_halfpage)|
@@ -86,10 +86,10 @@ nav: Big Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`y`, `Y`, `yy`|[\<hotkey_copy\>]({{ site.url }}/cheat_sheet/functions/#hotkey_copy)|
+|`yy`, `y`, `Y`|[\<hotkey_copy\>]({{ site.url }}/cheat_sheet/functions/#hotkey_copy)|
 |`p`, `P`|[\<hotkey_paste\>]({{ site.url }}/cheat_sheet/functions/#hotkey_paste)|
 |`dd`, `D`|[\<hotkey_cut\>]({{ site.url }}/cheat_sheet/functions/#hotkey_cut)|
-|`<Del>`, `x`|[\<hotkey_delete\>]({{ site.url }}/cheat_sheet/functions/#hotkey_delete)|
+|`x`, `<Del>`|[\<hotkey_delete\>]({{ site.url }}/cheat_sheet/functions/#hotkey_delete)|
 |`X`|[\<hotkey_backspace\>]({{ site.url }}/cheat_sheet/functions/#hotkey_backspace)|
 
 ## Command Mode
@@ -98,7 +98,7 @@ nav: Big Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`guivisual`, `gv`|[\<to_gui_visual\>]({{ site.url }}/cheat_sheet/functions/#to_gui_visual)|
+|`gv`, `guivisual`|[\<to_gui_visual\>]({{ site.url }}/cheat_sheet/functions/#to_gui_visual)|
 
 ### Shortcut
 
@@ -107,14 +107,14 @@ nav: Big Mappings
 |`vdprev`|[\<switch_to_left_vdesktop\>]({{ site.url }}/cheat_sheet/functions/#switch_to_left_vdesktop)|
 |`vdnext`|[\<switch_to_right_vdesktop\>]({{ site.url }}/cheat_sheet/functions/#switch_to_right_vdesktop)|
 |`closev`|[\<close_current_vdesktop\>]({{ site.url }}/cheat_sheet/functions/#close_current_vdesktop)|
-|`taskview`, `tv`, `vdesktop<space>list`|[\<taskview\>]({{ site.url }}/cheat_sheet/functions/#taskview)|
+|`tv`, `vdesktop<space>list`, `taskview`|[\<taskview\>]({{ site.url }}/cheat_sheet/functions/#taskview)|
 |`tabprevious`|[\<switch_to_left_tab\>]({{ site.url }}/cheat_sheet/functions/#switch_to_left_tab)|
 |`tabnext`|[\<switch_to_right_tab\>]({{ site.url }}/cheat_sheet/functions/#switch_to_right_tab)|
 |`tabnew`|[\<open_new_tab\>]({{ site.url }}/cheat_sheet/functions/#open_new_tab)|
-|`q!`, `tabclose`, `q`|[\<close_current_tab\>]({{ site.url }}/cheat_sheet/functions/#close_current_tab)|
+|`q`, `tabclose`, `q!`|[\<close_current_tab\>]({{ site.url }}/cheat_sheet/functions/#close_current_tab)|
 |`ex`, `explorer`|[\<start_explorer\>]({{ site.url }}/cheat_sheet/functions/#start_explorer)|
-|`start`, `win`|[\<open_startmenu\>]({{ site.url }}/cheat_sheet/functions/#open_startmenu)|
-|`find`, `open`|[\<open\>]({{ site.url }}/cheat_sheet/functions/#open)|
+|`win`, `start`|[\<open_startmenu\>]({{ site.url }}/cheat_sheet/functions/#open_startmenu)|
+|`open`, `find`|[\<open\>]({{ site.url }}/cheat_sheet/functions/#open)|
 |`forward`|[\<forward_ui_navigation\>]({{ site.url }}/cheat_sheet/functions/#forward_ui_navigation)|
 |`backward`|[\<backward_ui_navigation\>]({{ site.url }}/cheat_sheet/functions/#backward_ui_navigation)|
 |`decide`|[\<decide_focused_ui_object\>]({{ site.url }}/cheat_sheet/functions/#decide_focused_ui_object)|

diff --git a/docs/cheat_sheet/defaults/huge/index.md b/docs/cheat_sheet/defaults/huge/index.md
@@ -11,8 +11,6 @@ nav: Huge Mappings
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
 |`md`, `mkdir`|[\<makedir\>]({{ site.url }}/cheat_sheet/functions/#makedir)|
-|`target`|[\<enable_targeting_of_dedicate_to_window\>]({{ site.url }}/cheat_sheet/functions/#enable_targeting_of_dedicate_to_window)|
-|`untarget`|[\<disable_targeting_of_dedicate_to_window\>]({{ site.url }}/cheat_sheet/functions/#disable_targeting_of_dedicate_to_window)|
 
 <br>
 <br>

diff --git a/docs/cheat_sheet/defaults/normal/index.md b/docs/cheat_sheet/defaults/normal/index.md
@@ -10,7 +10,7 @@ nav: Normal Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`<esc-right>`, `<ctrl-[>`, `I`|[\<to_edi_normal\>]({{ site.url }}/cheat_sheet/functions/#to_edi_normal)|
+|`<esc-right>`, `I`, `<ctrl-[>`|[\<to_edi_normal\>]({{ site.url }}/cheat_sheet/functions/#to_edi_normal)|
 
 ## Editor Normal Mode
 
@@ -30,12 +30,12 @@ nav: Normal Mappings
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
 |`<C-y>`, `<C-k>`|[\<scroll_up\>]({{ site.url }}/cheat_sheet/functions/#scroll_up)|
-|`<C-e>`, `<C-j>`|[\<scroll_down\>]({{ site.url }}/cheat_sheet/functions/#scroll_down)|
+|`<C-j>`, `<C-e>`|[\<scroll_down\>]({{ site.url }}/cheat_sheet/functions/#scroll_down)|
 |`<C-u>`|[\<scroll_up_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_up_halfpage)|
 |`<C-d>`|[\<scroll_down_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_down_halfpage)|
 |`<C-b>`|[\<scroll_up_onepage\>]({{ site.url }}/cheat_sheet/functions/#scroll_up_onepage)|
 |`<C-f>`|[\<scroll_down_onepage\>]({{ site.url }}/cheat_sheet/functions/#scroll_down_onepage)|
-|`<C-h>`, `zh`|[\<scroll_left\>]({{ site.url }}/cheat_sheet/functions/#scroll_left)|
+|`zh`, `<C-h>`|[\<scroll_left\>]({{ site.url }}/cheat_sheet/functions/#scroll_left)|
 |`<C-l>`, `zl`|[\<scroll_right\>]({{ site.url }}/cheat_sheet/functions/#scroll_right)|
 |`zH`|[\<scroll_left_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_left_halfpage)|
 |`zL`|[\<scroll_right_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_right_halfpage)|
@@ -54,7 +54,7 @@ nav: Normal Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`I`, `gI`|[\<to_insert_BOL\>]({{ site.url }}/cheat_sheet/functions/#to_insert_bol)|
+|`gI`, `I`|[\<to_insert_BOL\>]({{ site.url }}/cheat_sheet/functions/#to_insert_bol)|
 |`a`|[\<to_insert_append\>]({{ site.url }}/cheat_sheet/functions/#to_insert_append)|
 |`A`|[\<to_insert_EOL\>]({{ site.url }}/cheat_sheet/functions/#to_insert_eol)|
 |`o`|[\<to_insert_nlbelow\>]({{ site.url }}/cheat_sheet/functions/#to_insert_nlbelow)|
@@ -64,10 +64,10 @@ nav: Normal Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`<C-h>`, `<Left>`, `h`, `<BS>`|[\<move_caret_left\>]({{ site.url }}/cheat_sheet/functions/#move_caret_left)|
-|`<Right>`, `l`, `<Space>`|[\<move_caret_right\>]({{ site.url }}/cheat_sheet/functions/#move_caret_right)|
-|`<Up>`, `gk`, `-`, `k`, `<C-p>`|[\<move_caret_up\>]({{ site.url }}/cheat_sheet/functions/#move_caret_up)|
-|`<Down>`, `<Enter>`, `<C-m>`, `gj`, `+`, `<C-n>`, `j`|[\<move_caret_down\>]({{ site.url }}/cheat_sheet/functions/#move_caret_down)|
+|`h`, `<Left>`, `<BS>`, `<C-h>`|[\<move_caret_left\>]({{ site.url }}/cheat_sheet/functions/#move_caret_left)|
+|`l`, `<Right>`, `<Space>`|[\<move_caret_right\>]({{ site.url }}/cheat_sheet/functions/#move_caret_right)|
+|`-`, `<C-p>`, `k`, `gk`, `<Up>`|[\<move_caret_up\>]({{ site.url }}/cheat_sheet/functions/#move_caret_up)|
+|`<Enter>`, `<C-n>`, `<Down>`, `+`, `<C-m>`, `gj`, `j`|[\<move_caret_down\>]({{ site.url }}/cheat_sheet/functions/#move_caret_down)|
 |`w`|[\<move_fwd_word\>]({{ site.url }}/cheat_sheet/functions/#move_fwd_word)|
 |`b`|[\<move_bck_word\>]({{ site.url }}/cheat_sheet/functions/#move_bck_word)|
 |`W`|[\<move_fwd_bigword\>]({{ site.url }}/cheat_sheet/functions/#move_fwd_bigword)|
@@ -81,30 +81,30 @@ nav: Normal Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`<Home>`, `0`, `g0`|[\<jump_caret_to_BOL\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_bol)|
-|`$`, `<End>`, `g$`|[\<jump_caret_to_EOL\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_eol)|
+|`<Home>`, `g0`, `0`|[\<jump_caret_to_BOL\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_bol)|
+|`<End>`, `g$`, `$`|[\<jump_caret_to_EOL\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_eol)|
 |`gg`|[\<jump_caret_to_BOF\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_bof)|
 |`G`|[\<jump_caret_to_EOF\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_eof)|
 
 ### Edit on Vim Emulation
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`Y`, `yy`|[\<yank_line\>]({{ site.url }}/cheat_sheet/functions/#yank_line)|
+|`yy`, `Y`|[\<yank_line\>]({{ site.url }}/cheat_sheet/functions/#yank_line)|
 |`y`|[\<yank_with_motion\>]({{ site.url }}/cheat_sheet/functions/#yank_with_motion)|
 |`p`|[\<put_after\>]({{ site.url }}/cheat_sheet/functions/#put_after)|
 |`P`|[\<put_before\>]({{ site.url }}/cheat_sheet/functions/#put_before)|
 |`dd`|[\<delete_line\>]({{ site.url }}/cheat_sheet/functions/#delete_line)|
 |`D`|[\<delete_line_until_EOL\>]({{ site.url }}/cheat_sheet/functions/#delete_line_until_eol)|
-|`<Del>`, `x`|[\<delete_after\>]({{ site.url }}/cheat_sheet/functions/#delete_after)|
+|`x`, `<Del>`|[\<delete_after\>]({{ site.url }}/cheat_sheet/functions/#delete_after)|
 |`X`|[\<delete_before\>]({{ site.url }}/cheat_sheet/functions/#delete_before)|
 |`J`|[\<join_next_line\>]({{ site.url }}/cheat_sheet/functions/#join_next_line)|
 |`r`|[\<replace_char\>]({{ site.url }}/cheat_sheet/functions/#replace_char)|
 |`R`|[\<replace_sequence\>]({{ site.url }}/cheat_sheet/functions/#replace_sequence)|
 |`~`|[\<switch_char_case\>]({{ site.url }}/cheat_sheet/functions/#switch_char_case)|
 |`d`|[\<delete_with_motion\>]({{ site.url }}/cheat_sheet/functions/#delete_with_motion)|
 |`c`|[\<change_with_motion\>]({{ site.url }}/cheat_sheet/functions/#change_with_motion)|
-|`S`, `cc`|[\<change_line\>]({{ site.url }}/cheat_sheet/functions/#change_line)|
+|`cc`, `S`|[\<change_line\>]({{ site.url }}/cheat_sheet/functions/#change_line)|
 |`s`|[\<change_char\>]({{ site.url }}/cheat_sheet/functions/#change_char)|
 |`C`|[\<change_until_EOL\>]({{ site.url }}/cheat_sheet/functions/#change_until_eol)|
 |`.`|[\<repeat_last_change\>]({{ site.url }}/cheat_sheet/functions/#repeat_last_change)|
@@ -125,12 +125,12 @@ nav: Normal Mappings
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
 |`<C-y>`, `<C-k>`|[\<scroll_up\>]({{ site.url }}/cheat_sheet/functions/#scroll_up)|
-|`<C-e>`, `<C-j>`|[\<scroll_down\>]({{ site.url }}/cheat_sheet/functions/#scroll_down)|
+|`<C-j>`, `<C-e>`|[\<scroll_down\>]({{ site.url }}/cheat_sheet/functions/#scroll_down)|
 |`<C-u>`|[\<scroll_up_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_up_halfpage)|
 |`<C-d>`|[\<scroll_down_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_down_halfpage)|
 |`<C-b>`|[\<scroll_up_onepage\>]({{ site.url }}/cheat_sheet/functions/#scroll_up_onepage)|
 |`<C-f>`|[\<scroll_down_onepage\>]({{ site.url }}/cheat_sheet/functions/#scroll_down_onepage)|
-|`<C-h>`, `zh`|[\<scroll_left\>]({{ site.url }}/cheat_sheet/functions/#scroll_left)|
+|`zh`, `<C-h>`|[\<scroll_left\>]({{ site.url }}/cheat_sheet/functions/#scroll_left)|
 |`<C-l>`, `zl`|[\<scroll_right\>]({{ site.url }}/cheat_sheet/functions/#scroll_right)|
 |`zH`|[\<scroll_left_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_left_halfpage)|
 |`zL`|[\<scroll_right_halfpage\>]({{ site.url }}/cheat_sheet/functions/#scroll_right_halfpage)|
@@ -139,19 +139,19 @@ nav: Normal Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`<C-h>`, `<Left>`, `h`, `<BS>`|[\<move_caret_left\>]({{ site.url }}/cheat_sheet/functions/#move_caret_left)|
-|`<Right>`, `l`, `<Space>`|[\<move_caret_right\>]({{ site.url }}/cheat_sheet/functions/#move_caret_right)|
-|`<Up>`, `gk`, `-`, `k`, `<C-p>`|[\<move_caret_up\>]({{ site.url }}/cheat_sheet/functions/#move_caret_up)|
-|`<Down>`, `<Enter>`, `<C-m>`, `gj`, `+`, `<C-n>`, `j`|[\<move_caret_down\>]({{ site.url }}/cheat_sheet/functions/#move_caret_down)|
+|`h`, `<Left>`, `<BS>`, `<C-h>`|[\<move_caret_left\>]({{ site.url }}/cheat_sheet/functions/#move_caret_left)|
+|`l`, `<Right>`, `<Space>`|[\<move_caret_right\>]({{ site.url }}/cheat_sheet/functions/#move_caret_right)|
+|`-`, `<C-p>`, `k`, `gk`, `<Up>`|[\<move_caret_up\>]({{ site.url }}/cheat_sheet/functions/#move_caret_up)|
+|`<Enter>`, `<C-n>`, `<Down>`, `+`, `<C-m>`, `gj`, `j`|[\<move_caret_down\>]({{ site.url }}/cheat_sheet/functions/#move_caret_down)|
 |`w`|[\<move_fwd_word_simple\>]({{ site.url }}/cheat_sheet/functions/#move_fwd_word_simple)|
 |`b`|[\<move_bck_word_simple\>]({{ site.url }}/cheat_sheet/functions/#move_bck_word_simple)|
 
 ### Caret Jumping on Vim Emulation
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`<Home>`, `0`, `g0`|[\<jump_caret_to_BOL\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_bol)|
-|`$`, `<End>`, `g$`|[\<jump_caret_to_EOL\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_eol)|
+|`<Home>`, `g0`, `0`|[\<jump_caret_to_BOL\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_bol)|
+|`<End>`, `g$`, `$`|[\<jump_caret_to_EOL\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_eol)|
 |`gg`|[\<jump_caret_to_BOF\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_bof)|
 |`G`|[\<jump_caret_to_EOF\>]({{ site.url }}/cheat_sheet/functions/#jump_caret_to_eof)|
 
@@ -160,7 +160,7 @@ nav: Normal Mappings
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
 |`y`|[\<yank_highlight_text\>]({{ site.url }}/cheat_sheet/functions/#yank_highlight_text)|
-|`d`, `X`, `x`|[\<delete_highlight_text\>]({{ site.url }}/cheat_sheet/functions/#delete_highlight_text)|
+|`X`, `x`, `d`|[\<delete_highlight_text\>]({{ site.url }}/cheat_sheet/functions/#delete_highlight_text)|
 |`c`, `S`, `s`|[\<change_highlight_text\>]({{ site.url }}/cheat_sheet/functions/#change_highlight_text)|
 
 ## Insert Mode
@@ -179,7 +179,7 @@ nav: Normal Mappings
 
 |**Trigger Commands**|**Called Commands**|
 |:---:|:---:|
-|`en`, `edinormal`|[\<to_edi_normal\>]({{ site.url }}/cheat_sheet/functions/#to_edi_normal)|
+|`edinormal`, `en`|[\<to_edi_normal\>]({{ site.url }}/cheat_sheet/functions/#to_edi_normal)|
 |`edivisual`, `ev`|[\<to_edi_visual\>]({{ site.url }}/cheat_sheet/functions/#to_edi_visual)|
 |`edivisualline`, `evl`|[\<to_edi_visual_line\>]({{ site.url }}/cheat_sheet/functions/#to_edi_visual_line)|