From 21ea62db56eaec619374e83e28458a86303d58de Mon Sep 17 00:00:00 2001 From: Foo Date: Wed, 14 Dec 2016 22:24:25 +0300 Subject: [PATCH] Move -- function command arguments after function name Fish 2.4.0-231-gd885f00 cannot handle current variant and fish 2.2.0 is still fine with new variant. --- powerline/bindings/fish/powerline-setup.fish | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerline/bindings/fish/powerline-setup.fish b/powerline/bindings/fish/powerline-setup.fish index f9539e7b..0795e703 100644 --- a/powerline/bindings/fish/powerline-setup.fish +++ b/powerline/bindings/fish/powerline-setup.fish @@ -33,14 +33,14 @@ function powerline-setup if test -z "$POWERLINE_COMMAND" set -g POWERLINE_COMMAND (env $POWERLINE_CONFIG_COMMAND shell command) end - function --on-variable fish_key_bindings _powerline_set_default_mode + function _powerline_set_default_mode --on-variable fish_key_bindings if test x$fish_key_bindings != xfish_vi_key_bindings set -g _POWERLINE_DEFAULT_MODE default else set -g -e _POWERLINE_DEFAULT_MODE end end - function --on-variable POWERLINE_COMMAND _powerline_update + function _powerline_update --on-variable POWERLINE_COMMAND set -l addargs "--last-exit-code=\$status" set -l addargs "$addargs --last-pipe-status=\$status" set -l addargs "$addargs --jobnum=(jobs -p | wc -l)" @@ -70,7 +70,7 @@ function powerline-setup env \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell right $addargs $rpromptpast end - function --on-signal WINCH _powerline_set_columns + function _powerline_set_columns --on-signal WINCH set -g _POWERLINE_COLUMNS $columnsexpr end " @@ -94,10 +94,10 @@ function powerline-setup env TMUX="$_POWERLINE_TMUX" tmux setenv -g TMUX_$argv[1]_(_powerline_tmux_pane) "$argv[2]" env TMUX="$_POWERLINE_TMUX" tmux refresh -S end - function --on-variable PWD _powerline_tmux_set_pwd + function _powerline_tmux_set_pwd --on-variable PWD _powerline_tmux_setenv PWD "$PWD" end - function --on-signal WINCH _powerline_tmux_set_columns + function _powerline_tmux_set_columns --on-signal WINCH _powerline_tmux_setenv COLUMNS (_powerline_columns) end _powerline_tmux_set_columns