aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/gui.txt24
-rw-r--r--runtime/lua/vim/_defaults.lua30
-rw-r--r--runtime/plugin/nvim.lua24
3 files changed, 41 insertions, 37 deletions
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index bf62dba539..a64d722177 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -443,18 +443,18 @@ You can define the special menu "PopUp". This is the menu that is displayed
when the right mouse button is pressed, if 'mousemodel' is set to popup or
popup_setpos.
-The default "PopUp" menu is: >
- aunmenu PopUp
- vnoremenu PopUp.Cut "+x
- vnoremenu PopUp.Copy "+y
- anoremenu PopUp.Paste "+gP
- vnoremenu PopUp.Paste "+P
- vnoremenu PopUp.Delete "_x
- nnoremenu PopUp.Select\ All ggVG
- vnoremenu PopUp.Select\ All gg0oG$
- inoremenu PopUp.Select\ All <C-Home><C-O>VG
- anoremenu PopUp.-1- <Nop>
- anoremenu PopUp.How-to\ disable\ mouse <Cmd>help disable-mouse<CR>
+The default "PopUp" menu is: >vim
+ vnoremenu PopUp.Cut "+x
+ vnoremenu PopUp.Copy "+y
+ anoremenu PopUp.Paste "+gP
+ vnoremenu PopUp.Paste "+P
+ vnoremenu PopUp.Delete "_x
+ nnoremenu PopUp.Select\ All ggVG
+ vnoremenu PopUp.Select\ All gg0oG$
+ inoremenu PopUp.Select\ All <C-Home><C-O>VG
+ anoremenu PopUp.Inspect <Cmd>Inspect<CR>
+ anoremenu PopUp.-1- <Nop>
+ anoremenu PopUp.How-to\ disable\ mouse <Cmd>help disable-mouse<CR>
<
Showing What Menus Are Mapped To *showing-menus*
diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua
index 6223082622..0798ca8d16 100644
--- a/runtime/lua/vim/_defaults.lua
+++ b/runtime/lua/vim/_defaults.lua
@@ -1,3 +1,31 @@
+--- Default user commands
+do
+ vim.api.nvim_create_user_command('Inspect', function(cmd)
+ if cmd.bang then
+ vim.print(vim.inspect_pos())
+ else
+ vim.show_pos()
+ end
+ end, { desc = 'Inspect highlights and extmarks at the cursor', bang = true })
+
+ vim.api.nvim_create_user_command('InspectTree', function(cmd)
+ if cmd.mods ~= '' or cmd.count ~= 0 then
+ local count = cmd.count ~= 0 and cmd.count or ''
+ local new = cmd.mods ~= '' and 'new' or 'vnew'
+
+ vim.treesitter.inspect_tree({
+ command = ('%s %s%s'):format(cmd.mods, count, new),
+ })
+ else
+ vim.treesitter.inspect_tree()
+ end
+ end, { desc = 'Inspect treesitter language tree for buffer', count = true })
+
+ vim.api.nvim_create_user_command('EditQuery', function(cmd)
+ vim.treesitter.query.edit(cmd.fargs[1])
+ end, { desc = 'Edit treesitter query', nargs = '?' })
+end
+
--- Default mappings
do
--- Default maps for * and # in visual mode.
@@ -93,7 +121,6 @@ do
--- Right click popup menu
-- TODO VimScript, no l10n
vim.cmd([[
- aunmenu *
vnoremenu PopUp.Cut "+x
vnoremenu PopUp.Copy "+y
anoremenu PopUp.Paste "+gP
@@ -102,6 +129,7 @@ do
nnoremenu PopUp.Select\ All ggVG
vnoremenu PopUp.Select\ All gg0oG$
inoremenu PopUp.Select\ All <C-Home><C-O>VG
+ anoremenu PopUp.Inspect <Cmd>Inspect<CR>
anoremenu PopUp.-1- <Nop>
anoremenu PopUp.How-to\ disable\ mouse <Cmd>help disable-mouse<CR>
]])
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
deleted file mode 100644
index 743d3044b6..0000000000
--- a/runtime/plugin/nvim.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-vim.api.nvim_create_user_command('Inspect', function(cmd)
- if cmd.bang then
- vim.print(vim.inspect_pos())
- else
- vim.show_pos()
- end
-end, { desc = 'Inspect highlights and extmarks at the cursor', bang = true })
-
-vim.api.nvim_create_user_command('InspectTree', function(cmd)
- if cmd.mods ~= '' or cmd.count ~= 0 then
- local count = cmd.count ~= 0 and cmd.count or ''
- local new = cmd.mods ~= '' and 'new' or 'vnew'
-
- vim.treesitter.inspect_tree({
- command = ('%s %s%s'):format(cmd.mods, count, new),
- })
- else
- vim.treesitter.inspect_tree()
- end
-end, { desc = 'Inspect treesitter language tree for buffer', count = true })
-
-vim.api.nvim_create_user_command('EditQuery', function(cmd)
- vim.treesitter.query.edit(cmd.fargs[1])
-end, { desc = 'Edit treesitter query', nargs = '?' })