From 2768d2ea06e03ae59c99da0fd4d4db582855bc35 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Mon, 30 May 2016 16:36:25 +0200 Subject: Style fixes for fish_vi_cursor "$fcn" [ci skip] --- share/functions/fish_vi_cursor.fish | 87 +++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 43 deletions(-) (limited to 'share') diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish index 5a7b9c8b..d14ddb1f 100644 --- a/share/functions/fish_vi_cursor.fish +++ b/share/functions/fish_vi_cursor.fish @@ -1,50 +1,51 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes' - set -l terminal $argv[1] - set -q terminal[1]; or set terminal auto - set -l uses_echo + set -l terminal $argv[1] + set -q terminal[1] + or set terminal auto + set -l uses_echo - set fcn - switch "$terminal" - case auto - if begin; set -q KONSOLE_PROFILE_NAME - or set -q ITERM_PROFILE; end - set fcn __fish_cursor_konsole - set uses_echo 1 - else if string match -q "xterm*" -- $TERM - set fcn __fish_cursor_xterm - set uses_echo 1 - else - return 1 - end - case konsole - set fcn __fish_cursor_konsole - set uses_echo 1 - case xterm - set fcn __fish_cursor_xterm - set uses_echo 1 - end + set -l function + switch "$terminal" + case auto + if set -q KONSOLE_PROFILE_NAME + or set -q ITERM_PROFILE + set function __fish_cursor_konsole + set uses_echo 1 + else if string match -q "xterm*" -- $TERM + set function __fish_cursor_xterm + set uses_echo 1 + else + return 1 + end + case konsole + set function __fish_cursor_konsole + set uses_echo 1 + case xterm + set function __fish_cursor_xterm + set uses_echo 1 + end - set -l tmux_prefix - set -l tmux_postfix - if begin; set -q TMUX; and set -q uses_echo[1]; end - set tmux_prefix echo -ne "'\ePtmux;\e'" - set tmux_postfix echo -ne "'\e\\\\'" - end + set -l tmux_prefix + set -l tmux_postfix + if set -q TMUX + and set -q uses_echo[1] + set tmux_prefix echo -ne "'\ePtmux;\e'" + set tmux_postfix echo -ne "'\e\\\\'" + end - set -q fish_cursor_unknown - or set -g fish_cursor_unknown block blink + set -q fish_cursor_unknown + or set -g fish_cursor_unknown block blink - echo " - function fish_vi_cursor_handle --on-variable fish_bind_mode - set -l varname fish_cursor_\$fish_bind_mode - if not set -q \$varname - set varname fish_cursor_unknown - end - #echo \$varname \$\$varname - $tmux_prefix - $fcn \$\$varname - $tmux_postfix - end - " | source + echo " + function fish_vi_cursor_handle --on-variable fish_bind_mode + set -l varname fish_cursor_\$fish_bind_mode + if not set -q \$varname + set varname fish_cursor_unknown + end + $tmux_prefix + $function \$\$varname + $tmux_postfix + end + " | source end -- cgit v1.2.3