mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-17 14:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prefer VISUAL to EDITOR

Browse Source 
Fix #2096
This commit is contained in:
toonn
2019-10-25 18:48:05 +02:00
parent 6634dc81fe
commit a64a0d64cb
3 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kitty/main.py
View File

@@ -247,19 +247,19 @@ def read_shell_environment(opts=None):
def setup_environment(opts, args):
extra_env = opts.env.copy()
if opts.editor == '.':
if 'EDITOR' not in os.environ:
if 'VISUAL' not in os.environ and 'EDITOR' not in os.environ:
shell_env = read_shell_environment(opts)
if 'EDITOR' in shell_env:
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 'VISUAL' in shell_env or 'EDITOR' in shell_env:
for editor in (shell_env['VISUAL'], 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: