KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kitty/config_data.py
View File

@ -812,9 +812,9 @@ ensure that the shell starts in interactive mode and reads its startup rc files.
o('editor', '.', long_text=_('''
The console editor to use when editing the kitty config file or similar tasks.
A value of . means to use the environment variable EDITOR. Note that this
environment variable has to be set not just in your shell startup scripts but
system-wide, otherwise kitty will not see it.
A value of . means to use the environment variables VISUAL and EDITOR in that
order. Note that this environment variable has to be set not just in your shell
startup scripts but system-wide, otherwise kitty will not see it.
'''))
o('close_on_child_death', False, long_text=_('''

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:

15
kitty/utils.py
View File

@ -415,15 +415,12 @@ def get_editor():
ans = getattr(get_editor, 'ans', False)
if ans is False:
import shlex
ans = os.environ.get('EDITOR')
if not ans or not exe_exists(shlex.split(ans)[0]):
for q in ('vim', 'nvim', 'vi', 'emacs', 'kak', 'micro', 'nano', 'vis'):
r = exe_exists(q)
if r:
ans = r
break
else:
ans = 'vim'
for ans in (os.environ.get('VISUAL'), os.environ.get('EDITOR'), 'vim',
'nvim', 'vi', 'emacs', 'kak', 'micro', 'nano', 'vis'):
if ans and exe_exists(shlex.split(ans)[0]):
break
else:
ans = 'vim'
ans = shlex.split(ans)
get_editor.ans = ans
return ans