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

Merge remote-tracking branch 'Delapouite/set-option' into master

Browse Source
This commit is contained in:
Maxime Coste 2018-04-22 09:41:15 +10:00
commit ee604fd863
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rc/base/x11.kak
View File

@ -1,7 +1,7 @@
# termcmd should be set-option such as the next argument is the whole # termcmd should be set such as the next argument is the whole
# command line to execute # command line to execute
declare-option -docstring %{shell command run to spawn a new terminal declare-option -docstring %{shell command run to spawn a new terminal
A shell command is appended to the one set-option in this option at runtime} \ A shell command is appended to the one set in this option at runtime} \
str termcmd %sh{ str termcmd %sh{
for termcmd in 'alacritty -e sh -c' \ for termcmd in 'alacritty -e sh -c' \
'termite -e ' \ 'termite -e ' \
@ -27,7 +27,7 @@ The optional arguments will be passed as arguments to the new client} \
-command-completion \ -command-completion \
x11-new %{ %sh{ x11-new %{ %sh{
if [ -z "${kak_opt_termcmd}" ]; then if [ -z "${kak_opt_termcmd}" ]; then
echo "echo -markup '{Error}termcmd option is not set-option'" echo "echo -markup '{Error}termcmd option is not set'"
exit exit
fi fi
if [ $# -ne 0 ]; then kakoune_params="-e '$@'"; fi if [ $# -ne 0 ]; then kakoune_params="-e '$@'"; fi

2
rc/extra/editorconfig.kak
View File

@ -3,7 +3,7 @@
declare-option -hidden bool editorconfig_trim_trailing_whitespace false declare-option -hidden bool editorconfig_trim_trailing_whitespace false
define-command editorconfig-load -params ..1 -docstring "editorconfig-load [file]: set-option formatting behavior according to editorconfig" %{ define-command editorconfig-load -params ..1 -docstring "editorconfig-load [file]: set formatting behavior according to editorconfig" %{
remove-hooks buffer editorconfig-hooks remove-hooks buffer editorconfig-hooks
%sh{ %sh{
command -v editorconfig >/dev/null 2>&1 || { echo 'echo -markup "{Error}editorconfig could not be found"'; exit 1; } command -v editorconfig >/dev/null 2>&1 || { echo 'echo -markup "{Error}editorconfig could not be found"'; exit 1; }

4
rc/extra/x11-repl.kak
View File

@ -1,11 +1,11 @@
# termcmd should already be set-option in x11.kak # termcmd should already be set in x11.kak
define-command -docstring %{x11-repl [<arguments>]: create a new window for repl interaction define-command -docstring %{x11-repl [<arguments>]: create a new window for repl interaction
All optional parameters are forwarded to the new window} \ All optional parameters are forwarded to the new window} \
-params .. \ -params .. \
-command-completion \ -command-completion \
x11-repl %{ %sh{ x11-repl %{ %sh{
if [ -z "${kak_opt_termcmd}" ]; then if [ -z "${kak_opt_termcmd}" ]; then
echo "echo -markup '{Error}termcmd option is not set-option'" echo "echo -markup '{Error}termcmd option is not set'"
exit exit
fi fi
if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi