diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2017-07-31 14:08:17 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2017-07-31 14:08:17 +0900 |
| commit | 9d2c6a95f4259e9bccc114f48b3b3d21a357b6d1 (patch) | |
| tree | 826e8bbcd0fe7e9bd35b81f60d4da376059d3b1d /shell/completion.bash | |
| parent | 376a76d1d3c39a1686b6ac7a6118c1f80af3178e (diff) | |
| download | fzf-9d2c6a95f4259e9bccc114f48b3b3d21a357b6d1.tar.gz | |
Revert "[bash] Do not append space when path completion is cancelled"
This reverts commit 376a76d1d3c39a1686b6ac7a6118c1f80af3178e as it
affects normal completion
Diffstat (limited to 'shell/completion.bash')
| -rw-r--r-- | shell/completion.bash | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/shell/completion.bash b/shell/completion.bash index eeb5a5d9..e8c34e57 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -151,7 +151,7 @@ __fzf_generic_path_completion() { matches=$(eval "$1 $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS" $fzf $2 -q "$leftover" | while read -r item; do printf "%q$3 " "$item" done) - [ $4 = 1 ] && matches=${matches% } + matches=${matches% } if [ -n "$matches" ]; then COMPREPLY=( "$matches" ) else @@ -167,7 +167,6 @@ __fzf_generic_path_completion() { shift shift shift - shift _fzf_handle_dynamic_completion "$cmd" "$@" fi } @@ -199,7 +198,7 @@ _fzf_complete() { } _fzf_path_completion() { - __fzf_generic_path_completion _fzf_compgen_path "-m" "" 0 "$@" + __fzf_generic_path_completion _fzf_compgen_path "-m" "" "$@" } # Deprecated. No file only completion. @@ -208,7 +207,7 @@ _fzf_file_completion() { } _fzf_dir_completion() { - __fzf_generic_path_completion _fzf_compgen_dir "" "/" 1 "$@" + __fzf_generic_path_completion _fzf_compgen_dir "" "/" "$@" } _fzf_complete_kill() { @@ -300,7 +299,7 @@ _fzf_defc() { # Anything for cmd in $a_cmds; do - _fzf_defc "$cmd" _fzf_path_completion "-o nospace -o default -o bashdefault" + _fzf_defc "$cmd" _fzf_path_completion "-o default -o bashdefault" done # Directory |