KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also handle non-absolute paths being used for $EDITOR

Browse Source
This commit is contained in:
Kovid Goyal
2019-07-22 10:30:11 +05:30
parent 50e7351c73
commit 88f25ccc76
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kitty/main.py
View File

@@ -226,7 +226,18 @@ def setup_environment(opts, args):
if 'EDITOR' not in os.environ: if 'EDITOR' not in os.environ:
shell_env = read_shell_environment(opts) shell_env = read_shell_environment(opts)
if 'EDITOR' in shell_env: if 'EDITOR' in shell_env:
os.environ['EDITOR'] = shell_env['EDITOR'] editor = shell_env['EDITOR']
if 'PATH' in shell_env:
import shlex
editor_cmd = shlex.split(editor)
if not os.path.isabs(editor_cmd[0]):
editor_cmd[0] = shutil.which(editor_cmd[0], path=shell_env['PATH'])
if editor_cmd[0]:
editor = ' '.join(map(shlex.quote, editor_cmd))
else:
editor = None
if editor:
os.environ['EDITOR'] = editor
else: else:
os.environ['EDITOR'] = opts.editor os.environ['EDITOR'] = opts.editor
if args.listen_on: if args.listen_on: