aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/lua/init/02-commands.lua4
-rw-r--r--.config/nvim/lua/init/04-mappings.lua1
-rw-r--r--.config/nvim/lua/vimrc/plugins.lua4
3 files changed, 6 insertions, 3 deletions
diff --git a/.config/nvim/lua/init/02-commands.lua b/.config/nvim/lua/init/02-commands.lua
index 541e8da..6c82442 100644
--- a/.config/nvim/lua/init/02-commands.lua
+++ b/.config/nvim/lua/init/02-commands.lua
@@ -34,9 +34,9 @@ C(
)
if is_empty_buffer then
- vim.cmd(mods .. ' edit ' .. args)
+ vim.cmd(opts.mods .. ' edit ' .. opts.args)
else
- vim.cmd(mods .. ' tabedit ' .. args)
+ vim.cmd(opts.mods .. ' tabedit ' .. opts.args)
end
end,
{
diff --git a/.config/nvim/lua/init/04-mappings.lua b/.config/nvim/lua/init/04-mappings.lua
index f7f8a41..3b3c8c1 100644
--- a/.config/nvim/lua/init/04-mappings.lua
+++ b/.config/nvim/lua/init/04-mappings.lua
@@ -4,6 +4,7 @@ local O = vim.o
local K = vim.keymap
local vimrc = require('vimrc')
+local my_env = require('vimrc.my_env')
-- Note: |:noremap| defines mappings in |Normal|, |Visual|, |Operator-Pending|
diff --git a/.config/nvim/lua/vimrc/plugins.lua b/.config/nvim/lua/vimrc/plugins.lua
index 2e1d9cc..bc19889 100644
--- a/.config/nvim/lua/vimrc/plugins.lua
+++ b/.config/nvim/lua/vimrc/plugins.lua
@@ -348,7 +348,9 @@ packer.startup(function(use)
vimrc.autocmd('FileType', {
pattern = {'fern'},
callback = function()
- vim.keymap.del('n', 't', { buffer = true })
+ if vim.fn.hasmapto('<Plug>(fern-action-open:tabedit)', 'n') == 1 then
+ vim.keymap.del('n', 't', { buffer = true })
+ end
end,
})
end,