diff options
| author | Maxime Coste <mawww@kakoune.org> | 2018-04-22 09:41:15 +1000 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2018-04-22 09:41:15 +1000 |
| commit | ee604fd86315c8a17e2f6bf0f87f6366cc89beaf (patch) | |
| tree | d8e3cdac70181555fbe4914a92d680d3de7dd008 | |
| parent | 4c5a3c1dff8b7f0c23fa5a0ca3c73464b5355d0d (diff) | |
| parent | 9eb1bb4481b2b0a10b2962651007b6f6016241a1 (diff) | |
Merge remote-tracking branch 'Delapouite/set-option' into master
| -rw-r--r-- | rc/base/x11.kak | 6 | ||||
| -rw-r--r-- | rc/extra/editorconfig.kak | 2 | ||||
| -rw-r--r-- | rc/extra/x11-repl.kak | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/rc/base/x11.kak b/rc/base/x11.kak index 97cff767..5d16fd6c 100644 --- a/rc/base/x11.kak +++ b/rc/base/x11.kak @@ -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 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{ for termcmd in 'alacritty -e sh -c' \ 'termite -e ' \ @@ -27,7 +27,7 @@ The optional arguments will be passed as arguments to the new client} \ -command-completion \ x11-new %{ %sh{ 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 fi if [ $# -ne 0 ]; then kakoune_params="-e '$@'"; fi diff --git a/rc/extra/editorconfig.kak b/rc/extra/editorconfig.kak index 767360bb..23a5ebd3 100644 --- a/rc/extra/editorconfig.kak +++ b/rc/extra/editorconfig.kak @@ -3,7 +3,7 @@ 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 %sh{ command -v editorconfig >/dev/null 2>&1 || { echo 'echo -markup "{Error}editorconfig could not be found"'; exit 1; } diff --git a/rc/extra/x11-repl.kak b/rc/extra/x11-repl.kak index 41fdcb8f..57b4c140 100644 --- a/rc/extra/x11-repl.kak +++ b/rc/extra/x11-repl.kak @@ -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 All optional parameters are forwarded to the new window} \ -params .. \ -command-completion \ x11-repl %{ %sh{ 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 fi if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi |