summary refs log tree commit diff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2014-04-15 21:34:14 +0200
committerMikael Magnusson <mikachu@gmail.com>2015-08-12 17:54:42 +0200
commit64725416785a098139cdaca05b552379137a1360 (patch)
tree981105df8c5b13e0929ce29489e840238fd55b32
parentf6c3a2f86a0336ef40d69e6888b70b5b8b2ecfdf (diff)
downloadzsh-64725416785a098139cdaca05b552379137a1360.tar.gz
zsh-64725416785a098139cdaca05b552379137a1360.tar.xz
zsh-64725416785a098139cdaca05b552379137a1360.zip
36118: _imagemagick: complete all files if image files didn't match
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_imagemagick2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a5127ed0..f4de2b7b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
 	* 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
+
 2015-08-11  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 36108: NEWS: list of major changes so far since 5.0.8
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