Merge remote-tracking branch 'eraserhd/runtime-var'

This commit is contained in:
Maxime Coste 2020-08-06 20:15:38 +10:00
commit 5aa657b150
2 changed files with 5 additions and 2 deletions

View File

@ -306,8 +306,8 @@ The following expansions are supported (with required context _in italics_):
current register when the mapping was triggered
*%val{runtime}*::
directory containing the kak support files, determined from Kakoune's
binary location
the directory containing the kak support files, which is determined from
Kakoune's binary location if `$KAKOUNE_RUNTIME` is not set
*%val{select_mode}*::
_for commands executed from the object menu's `<a-;>` only_ +

View File

@ -144,6 +144,9 @@ inline void write_stderr(StringView str) { try { write(STDERR_FILENO, str); } ca
String runtime_directory()
{
if (const char* runtime_directory = getenv("KAKOUNE_RUNTIME"))
return runtime_directory;
char relpath[PATH_MAX+1];
format_to(relpath, "{}../share/kak", split_path(get_kak_binary_path()).first);
struct stat st;