diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-26 06:12:25 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-26 06:12:25 +0000 |
| commit | bfa4f17652830a69698d180435a0df045843723e (patch) | |
| tree | a7739aa7e402e110a1efdd78a12a38e4571e59f5 | |
| parent | bc21696b63fbc01f34351630f15a196134c8a458 (diff) | |
| download | zsh-bfa4f17652830a69698d180435a0df045843723e.tar.gz zsh-bfa4f17652830a69698d180435a0df045843723e.tar.xz zsh-bfa4f17652830a69698d180435a0df045843723e.zip | |
file-sort made $fignore fail (10922)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/Core/_path_files | 26 |
2 files changed, 17 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 944590380..c4a28d895 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-04-26 Sven Wischnowsky <wischnow@informatik.hu-berlin.de> + + * 10922: Completion/Core/_path_files: file-sort made $fignore fail + 2000-04-25 Sven Wischnowsky <wischnow@informatik.hu-berlin.de> * 10917: Src/Zle/complist.c, Src/Zle/compresult.c: don't show diff --git a/Completion/Core/_path_files b/Completion/Core/_path_files index 10fe39869..31b8dff66 100644 --- a/Completion/Core/_path_files +++ b/Completion/Core/_path_files @@ -86,6 +86,19 @@ if (( ! $mopts[(I)-[JVX]] )); then mopts=( "$mopts[@]" "$expl[@]" ) fi +# If given no `-F' option, we may want to use $fignore, turned into patterns. + +[[ -z "$_comp_no_ignore" && $#ignore -eq 0 && + ( -z $gopt || "$pats" = \ #\*\ # ) && -n $FIGNORE ]] && + ignore=( "?*${^fignore[@]}" ) + +if (( $#ignore )); then + _comp_ignore=( "$_comp_ignore[@]" "$ignore[@]" ) + (( $mopts[(I)-F] )) || mopts=( "$mopts[@]" -F _comp_ignore ) +fi + +(( $#matcher )) && mopts=( "$mopts[@]" "$matcher[@]" ) + if zstyle -s ":completion:${curcontext}:files" file-sort tmp1; then case "$tmp1" in *size*) sort=oL;; @@ -140,19 +153,6 @@ eorig="$orig" ( -n "$compstate[pattern_match]" && "${orig#\~}" != "${${orig#\~}:q}" ) ]] && menu=yes -# If given no `-F' option, we may want to use $fignore, turned into patterns. - -[[ -z "$_comp_no_ignore" && $#ignore -eq 0 && - ( -z $gopt || "$pats" = \ #\*\ # ) && -n $FIGNORE ]] && - ignore=( "?*${^fignore[@]}" ) - -if (( $#ignore )); then - _comp_ignore=( "$_comp_ignore[@]" "$ignore[@]" ) - (( $mopts[(I)-F] )) || mopts=( "$mopts[@]" -F _comp_ignore ) -fi - -(( $#matcher )) && mopts=( "$mopts[@]" "$matcher[@]" ) - # Now let's have a closer look at the string to complete. if [[ "$pre[1]" = \~ ]]; then |