From b6fc5bb9bbd0a8dca33f27ae5f44539fbb109a6f Mon Sep 17 00:00:00 2001 From: CPea Date: Sun, 19 Feb 2023 17:53:35 +0700 Subject: fix(terminal): don't set the shell by default (#3867) * fix(terminal): set user's shell before calling setup * refactor: set `vim.o.shell` directly in `cmd` opts --- lua/lvim/core/terminal.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/lvim/core/terminal.lua b/lua/lvim/core/terminal.lua index 45495322..6e0cb582 100644 --- a/lua/lvim/core/terminal.lua +++ b/lua/lvim/core/terminal.lua @@ -18,7 +18,7 @@ M.config = function() -- direction = 'vertical' | 'horizontal' | 'window' | 'float', direction = "float", close_on_exit = true, -- close the terminal window when the process exits - shell = vim.o.shell, -- change the default shell + shell = nil, -- change the default shell -- This field is only relevant if direction is set to 'float' float_opts = { -- The border key is *almost* the same as 'nvim_win_open' @@ -82,7 +82,7 @@ M.init = function() local direction = exec[4] or lvim.builtin.terminal.direction local opts = { - cmd = exec[1] or lvim.builtin.terminal.shell, + cmd = exec[1] or lvim.builtin.terminal.shell or vim.o.shell, keymap = exec[2], label = exec[3], -- NOTE: unable to consistently bind id/count <= 9, see #2146 -- cgit v1.2.3