diff options
author | Mikael Magnusson <mikachu@gmail.com> | 2015-08-15 00:15:00 +0200 |
---|---|---|
committer | Mikael Magnusson <mikachu@gmail.com> | 2015-08-15 00:15:22 +0200 |
commit | 019dbbf1663a25b257cbc8ab646de2bdc83d6b3a (patch) | |
tree | 09afcbb32c3edc2f8fce62d72e9462c85bd4dccb | |
parent | 9a4e1bf93b0bd60b39bb59fb9bc603cfe891b2d1 (diff) | |
download | zsh-019dbbf1663a25b257cbc8ab646de2bdc83d6b3a.tar.gz zsh-019dbbf1663a25b257cbc8ab646de2bdc83d6b3a.tar.xz zsh-019dbbf1663a25b257cbc8ab646de2bdc83d6b3a.zip |
Revert 36118
This works already except if list-dirs-first is set, and that is being fixed separately.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Completion/Unix/Command/_imagemagick | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f7c734279..abba0622c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,9 +63,6 @@ * 36117: Completion/Unix/Command/_wget: complete headers for --header and add --no-use-server-timestamps - * 36118: Completion/Unix/Command/_imagemagick: complete all - files if image files didn't match - * 36120: Completion/Unix/Command/_sort: Fix syntax error * 36119: Completion/Zsh/Command/_strftime: Add completion for diff --git a/Completion/Unix/Command/_imagemagick b/Completion/Unix/Command/_imagemagick index c43086c45..115cb01e4 100644 --- a/Completion/Unix/Command/_imagemagick +++ b/Completion/Unix/Command/_imagemagick @@ -14,7 +14,7 @@ typeset -A opt_args formats=jpg:jpeg:jp2:j2k:jpc:jpx:jpf:tiff:miff:ras:bmp:cgm:dcx:ps:eps:fig:fits:fpx:gif:mpeg:pbm:pgm:ppm:pcd:pcl:pdf:pcx:png:rad:rgb:rgba:rle:sgi:html:shtml:tga:ttf:uil:xcf:xwd:xbm:xpm:yuv if (( $# )); then - _files "$@" -g "*.(#i)(${~formats//:/|})(-.)" || _files "$@" + _files "$@" -g "*.(#i)(${~formats//:/|})(-.)" return fi |