From 64725416785a098139cdaca05b552379137a1360 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 15 Apr 2014 21:34:14 +0200 Subject: 36118: _imagemagick: complete all files if image files didn't match --- Completion/Unix/Command/_imagemagick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_imagemagick') diff --git a/Completion/Unix/Command/_imagemagick b/Completion/Unix/Command/_imagemagick index 115cb01e4..c43086c45 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 "$@" -g "*.(#i)(${~formats//:/|})(-.)" || _files "$@" return fi -- cgit v1.2.3 From 019dbbf1663a25b257cbc8ab646de2bdc83d6b3a Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 15 Aug 2015 00:15:00 +0200 Subject: Revert 36118 This works already except if list-dirs-first is set, and that is being fixed separately. --- ChangeLog | 3 --- Completion/Unix/Command/_imagemagick | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'Completion/Unix/Command/_imagemagick') 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 -- cgit v1.2.3 From fb063f964937728104865a7dcbe6c1682ef5a99a Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 15 Aug 2015 00:33:20 +0200 Subject: 36172: _imagemagick: Use $formats a bit more correctly --- ChangeLog | 5 +++++ Completion/Unix/Command/_imagemagick | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'Completion/Unix/Command/_imagemagick') diff --git a/ChangeLog b/ChangeLog index 83775b12b..857bf1046 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-08-17 Mikael Magnusson + + * 36172: Completion/Unix/Command/_imagemagick: Use $formats a + bit more correctly + 2015-08-17 Barton E. Schaefer * unposted (cf. 36200): Completion/Base/Completer/_expand: back out diff --git a/Completion/Unix/Command/_imagemagick b/Completion/Unix/Command/_imagemagick index 115cb01e4..1fc6089c8 100644 --- a/Completion/Unix/Command/_imagemagick +++ b/Completion/Unix/Command/_imagemagick @@ -1,6 +1,7 @@ #compdef animate composite combine convert display identify import mogrify montage xtp -local state line expl formats curcontext="$curcontext" +local state line expl curcontext="$curcontext" +local -a formats typeset -A opt_args # Things that could be improved: @@ -11,10 +12,10 @@ typeset -A opt_args # # and certainly many other things... -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 +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 "$@" -g "*.(#i)(${(j:|:)formats})(-.)" return fi @@ -444,7 +445,7 @@ case "$service" in '*-filter:filter type for resizing:(Point Box Triangle Hermite Hanning Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell Lanczos Bessel Sinc)' \ '*-flip[vertical mirror image]' \ '*-flop[horizontal mirror image]' \ - "*-format:output file format:(${formats//:/ })" \ + "*-format:output file format:($formats)" \ '*-font:annotation font:_x_font' \ '*-frame:border dimensions (x++)' \ '*-fuzz:maximum distance for equal colors' \ -- cgit v1.2.3