From 2b425ad221831b7f149042265fcc72b847b8488a Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Tue, 26 Sep 2017 13:25:29 -0500 Subject: [PATCH] Don't use xdg-open if running in terminal mode (i.e. no Xorg) If the $DISPLAY environment variable is not set, xdg-open should not be used to load the web browser. Just because it is installed does not mean that the user exclusively runs in an X session. Needed for Lynx detection to work around #4170 --- share/functions/help.fish | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/functions/help.fish b/share/functions/help.fish index 30cf5d9d9..6a63f33a7 100644 --- a/share/functions/help.fish +++ b/share/functions/help.fish @@ -55,8 +55,9 @@ function help --description 'Show help for the fish shell' # If the OS appears to be Windows (graphical), try to use cygstart if type -q cygstart set fish_browser cygstart - # If xdg-open is available, just use that - else if type -q xdg-open + # If xdg-open is available, just use that + # but only if an X session is running + else if type -q xdg-open; and set -q -x DISPLAY set fish_browser xdg-open end