From 617b52f8f4b51282b25b061a207160979143a6c2 Mon Sep 17 00:00:00 2001 From: Aram Drevekenin Date: Tue, 18 Oct 2022 17:33:48 +0200 Subject: [PATCH] fix(editor): default to vi when no editor is set (#1811) * fix(editor): default to vi when no editor is set * style(fmt): rustfmt --- zellij-server/src/os_input_output.rs | 12 ++++-------- zellij-server/src/pty.rs | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/zellij-server/src/os_input_output.rs b/zellij-server/src/os_input_output.rs index 7d83085f..29b7c75a 100644 --- a/zellij-server/src/os_input_output.rs +++ b/zellij-server/src/os_input_output.rs @@ -245,15 +245,11 @@ fn spawn_terminal( let mut failover_cmd_args = None; let cmd = match terminal_action { TerminalAction::OpenFile(file_to_open, line_number) => { - if default_editor.is_none() - && env::var("EDITOR").is_err() - && env::var("VISUAL").is_err() - { - return Err(SpawnTerminalError::NoEditorFound); - } - let mut command = default_editor.unwrap_or_else(|| { - PathBuf::from(env::var("EDITOR").unwrap_or_else(|_| env::var("VISUAL").unwrap())) + PathBuf::from( + env::var("EDITOR") + .unwrap_or_else(|_| env::var("VISUAL").unwrap_or_else(|_| "vi".into())), + ) }); let mut args = vec![]; diff --git a/zellij-server/src/pty.rs b/zellij-server/src/pty.rs index 9fa8e196..b18be108 100644 --- a/zellij-server/src/pty.rs +++ b/zellij-server/src/pty.rs @@ -136,6 +136,7 @@ pub(crate) fn pty_thread_main(mut pty: Pty, layout: Box) { ); } } else { + log::error!("Failed to spawn terminal: command not found"); pty.close_pane(PaneId::Terminal(pid)); } },