This commit is contained in:
Kovid Goyal 2020-12-29 11:36:30 +05:30
parent 65361d56c4
commit 175ff4b955
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -223,20 +223,20 @@ def resolve_editor_cmd(editor: str, shell_env: Mapping[str, str]) -> Optional[st
return editor return editor
if not editor_exe: if not editor_exe:
return None return None
def patched(exe: str) -> str:
editor_cmd[0] = exe
return ' '.join(map(shlex.quote, editor_cmd))
if shell_env is os.environ: if shell_env is os.environ:
q = find_exe(editor_exe) q = find_exe(editor_exe)
if q: if q:
editor_cmd[0] = q return patched(q)
editor = ' '.join(map(shlex.quote, editor_cmd)) elif 'PATH' in shell_env:
return editor
return None
if 'PATH' in shell_env:
import shlex import shlex
q = shutil.which(editor_exe, path=shell_env['PATH']) q = shutil.which(editor_exe, path=shell_env['PATH'])
if q: if q:
editor_cmd[0] = q return patched(q)
editor = ' '.join(map(shlex.quote, editor_cmd))
return editor
def get_editor_from_env(shell_env: Mapping[str, str]) -> Optional[str]: def get_editor_from_env(shell_env: Mapping[str, str]) -> Optional[str]: