xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename kakrc::autoload to kakrc::autoload_directory

Browse Source 
`autoload` is a reserved keyword in the ksh family of shells.
Some of these are common `/bin/sh` providers (e.g mksh).
Renaming it to have a prefix fixes autoloading on such systems (see #1353).
This should not have any side effects due to the limited scope.
This commit is contained in:
Chloe Kudryavtsev 2017-05-08 21:35:48 -04:00
parent 787ea7bc49
commit b6555d07a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/kak/kakrc
View File

@ -23,7 +23,7 @@ def -params 1 -docstring "colorscheme <name>: enable named colorscheme" \
}} }}
%sh{ %sh{
autoload() { autoload_directory() {
dir=$1 dir=$1
for rcfile in ${dir}/*.kak; do for rcfile in ${dir}/*.kak; do
if [ -f "$rcfile" ]; then if [ -f "$rcfile" ]; then
@ -32,7 +32,7 @@ def -params 1 -docstring "colorscheme <name>: enable named colorscheme" \
done done
for subdir in ${dir}/*; do for subdir in ${dir}/*; do
if [ -d "$subdir" ]; then if [ -d "$subdir" ]; then
autoload $subdir autoload_directory $subdir
fi fi
done done
} }
@ -42,9 +42,9 @@ def -params 1 -docstring "colorscheme <name>: enable named colorscheme" \
echo "colorscheme default" echo "colorscheme default"
if [ -d "${localconfdir}/autoload" ]; then if [ -d "${localconfdir}/autoload" ]; then
autoload ${localconfdir}/autoload autoload_directory ${localconfdir}/autoload
elif [ -d "${kak_runtime}/autoload" ]; then elif [ -d "${kak_runtime}/autoload" ]; then
autoload ${kak_runtime}/autoload autoload_directory ${kak_runtime}/autoload
fi fi
if [ -f "${kak_runtime}/kakrc.local" ]; then if [ -f "${kak_runtime}/kakrc.local" ]; then