From 127254323758e36fb9f10c796908f37cdc127537 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sun, 27 Mar 2022 21:44:32 +0300 Subject: [PATCH] Use EDITOR environment variable When preferences do not specify a program to be used for /editor command, try getting it from EDITOR (which POSIX.1-2017 calls one of "variables that are frequently exported by widely used command interpreters and applications"), fall back to "vim" if not set. --- src/config/preferences.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/config/preferences.c b/src/config/preferences.c index 63d665f6..358c5fbf 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -2277,8 +2277,10 @@ _get_default_string(preference_t pref) return "xdg-open"; case PREF_URL_OPEN_CMD: return "xdg-open %u"; - case PREF_COMPOSE_EDITOR: - return "vim"; + case PREF_COMPOSE_EDITOR: { + gchar* editor = getenv("EDITOR"); + return editor ? editor : "vim"; + } case PREF_URL_SAVE_CMD: return NULL; // Default to built-in method. default: