diff options
| author |  Fabian Homborg <FHomborg@gmail.com> | 2016-04-12 20:32:29 +0200 |
|---|---|---|
| committer | Fabian Homborg <FHomborg@gmail.com> | 2016-04-26 15:21:15 +0200 |
| commit | 8ab980b793e80199f61257b1bc46826a93af8413 (patch) | |
| tree | 43f52f18620899d0da497f205716ce3abe741849 /share/functions | |
| parent | dcef1a55932db5ad4394eb6fbcb76d63d8ab520d (diff) | |
Remove $__fish_vi_mode
This makes fish_mode_prompt rely on $fish_key_bindings instead.
fish_bind_mode is also set in default mode (only always "default"), so
it can't be used as the indicator.
Diffstat (limited to 'share/functions')
| -rw-r--r-- | share/functions/fish_mode_prompt.fish | 2 | ||||
| -rw-r--r-- | share/functions/fish_vi_mode.fish | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/share/functions/fish_mode_prompt.fish b/share/functions/fish_mode_prompt.fish index e9b49e5b..eed75d42 100644 --- a/share/functions/fish_mode_prompt.fish +++ b/share/functions/fish_mode_prompt.fish @@ -1,7 +1,7 @@ # The fish_mode_prompt function is prepended to the prompt function fish_mode_prompt --description "Displays the current mode" # Do nothing if not in vi mode - if set -q __fish_vi_mode + if test "$fish_key_bindings" = "fish_vi_key_bindings" switch $fish_bind_mode case default set_color --bold --background red white diff --git a/share/functions/fish_vi_mode.fish b/share/functions/fish_vi_mode.fish index b4fbe63a..8c89a53e 100644 --- a/share/functions/fish_vi_mode.fish +++ b/share/functions/fish_vi_mode.fish @@ -1,8 +1,4 @@ function fish_vi_mode - # Set the __fish_vi_mode variable - # This triggers fish_mode_prompt to output the mode indicator - set -g __fish_vi_mode 1 - # Turn on vi keybindings set -g fish_key_bindings fish_vi_key_bindings end |