From 7e529362470125102f60354d6938154363c4e21d Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 2 Mar 2021 22:23:10 -0500 Subject: support VISUAL in preference to EDITOR --- src/edit.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/edit.rs') diff --git a/src/edit.rs b/src/edit.rs index 8325072..cac8794 100644 --- a/src/edit.rs +++ b/src/edit.rs @@ -3,8 +3,11 @@ use crate::prelude::*; use std::io::{Read as _, Write as _}; pub fn edit(contents: &str, help: &str) -> Result { - let editor = - std::env::var_os("EDITOR").unwrap_or_else(|| "/usr/bin/vim".into()); + let mut var = "VISUAL"; + let editor = std::env::var_os(var).unwrap_or_else(|| { + var = "EDITOR"; + std::env::var_os(var).unwrap_or_else(|| "/usr/bin/vim".into()) + }); let editor = std::path::Path::new(&editor); let mut args = vec![]; @@ -21,6 +24,7 @@ pub fn edit(contents: &str, help: &str) -> Result { }, None => { return Err(Error::InvalidEditor { + var: var.to_string(), editor: editor.as_os_str().to_os_string(), }) } -- cgit v1.2.3-54-g00ecf