Merge remote-tracking branch 'doppioandante/safer-autoload'

This commit is contained in:
Maxime Coste 2015-12-12 17:03:38 +00:00
commit 8d7e16a8e6
2 changed files with 2 additions and 6 deletions

View File

@ -36,7 +36,7 @@ def -params 1 -docstring "colorscheme <name>: enable named colorscheme" \
autoload() { autoload() {
dir=$1 dir=$1
for rcfile in ${dir}/*.kak; do for rcfile in ${dir}/*.kak; do
echo "try %{ source '${rcfile}' } catch %{ }"; echo "try %{ source '${rcfile}' } catch %{ echo -debug Autoload: could not load '${rcfile}' }";
done done
for subdir in ${dir}/*; do for subdir in ${dir}/*; do
if [ -d "$subdir" ]; then if [ -d "$subdir" ]; then

View File

@ -72,10 +72,6 @@ clean:
XDG_CONFIG_HOME ?= $(HOME)/.config XDG_CONFIG_HOME ?= $(HOME)/.config
userconfig:
mkdir -p $(XDG_CONFIG_HOME)/kak/autoload
ln -s $(CURDIR)/../rc/*.kak $(XDG_CONFIG_HOME)/kak/autoload/
install: kak install: kak
mkdir -p $(bindir) mkdir -p $(bindir)
install -m 0755 kak $(bindir) install -m 0755 kak $(bindir)
@ -89,4 +85,4 @@ install: kak
install -m 0644 ../README.asciidoc $(docdir) install -m 0644 ../README.asciidoc $(docdir)
install -m 0644 ../doc/* $(docdir) install -m 0644 ../doc/* $(docdir)
.PHONY: tags userconfig install .PHONY: tags install