19387: add (-.) glob qualifier to globs where only files are directly applicable

9 files changed, 79 insertions, 79 deletions

diff --git a/Completion/X/Command/_acroread b/Completion/X/Command/_acroread
index 051a32151..7ae889914 100644
--- a/Completion/X/Command/_acroread
+++ b/Completion/X/Command/_acroread
@@ -16,10 +16,10 @@ _x_arguments -C \
   '-visual:X visual:_x_visual' \
   '-xrm:X resource specification:_x_resource' \
   '-toPostScript:*::PostScript conversion options:= ->tops' \
-  '*:pdf file:_files -g "*.(#i)pdf"' && return
+  '*:pdf file:_files -g "*.(#i)pdf(-.)"' && return
 
 [[ -n "$state" ]] && _arguments \
-  '-pairs:*:pdf_file_1 ps_file_1 ...:_files -g "*.(#i)(pdf|ps)"' \
+  '-pairs:*:pdf_file_1 ps_file_1 ...:_files -g "*.(#i)(pdf|ps)(-.)"' \
   -binary \
   '-start:integer' \
   '-end:integer' \
@@ -38,6 +38,6 @@ _x_arguments -C \
   -shrink \
   '-size:page size (or custom size wxh in points):(letter tabloid ledger legal executive a3 a4 a5 b4 b5)' \
   '-transQuality:transparency flattening level:(1 2 3 4 5)' \
-  '*:pdf file:_files -g "*.(#i)pdf"' && return
+  '*:pdf file:_files -g "*.(#i)pdf(-.)"' && return
 
 return 1
diff --git a/Completion/X/Command/_gqview b/Completion/X/Command/_gqview
index 309bc1a38..f317ab538 100644
--- a/Completion/X/Command/_gqview
+++ b/Completion/X/Command/_gqview
@@ -9,4 +9,4 @@ _arguments \
   '--debug[turn on debug output]' \
   '(--version -v)'{-v,--version}'[print version info]' \
   '(--help -h)'{-h,--help}'[show help]' \
-  '*:picture file:_files -/ -g \*.\(\#i\)\(jpg\|jpe\|jpeg\|png\|gif\|tif\|tiff\|bmp\)'
+  '*:picture file:_files -g "*.(#i)(jpg|jpe|jpeg|png|gif|tif|tiff|bmp)(-.)"'
diff --git a/Completion/X/Command/_mplayer b/Completion/X/Command/_mplayer
index c465d283e..ea2922b36 100644
--- a/Completion/X/Command/_mplayer
+++ b/Completion/X/Command/_mplayer
@@ -14,7 +14,7 @@ _x_arguments -C -s \
   '-aofile:file:_files' \
   '(-nosound)*-aop[specify audio output filter]:audio output filter:->audio-plugins' \
   '-aspect:ratio' \
-  '-audiofile:audio file:_files -g "(#i)*.(wav|mp3|ogg)"' \
+  '-audiofile:audio file:_files -g "(#i)*.(wav|mp3|ogg)(-.)"' \
   -autoq:quality -autosync:factor \
   -bandwidth:bandwidth\ value -benchmark -bpp:depth \
   '(-nocache)-cache:cache size (kb)' \
@@ -115,7 +115,7 @@ case "$state" in
     _tags files urls
     while _tags; do
       _requested files expl 'video file' _files -g \
-          "*.(#i)(avi|mp3|mpg|mpe|mpeg|m1v|mov|asf|vob|mjpg|wma|wmv|asx|qt|rm|mkv|mka|ogm|ogg)" && ret=0
+          "*.(#i)(avi|mp3|mpg|mpe|mpeg|m1v|mov|asf|vob|mjpg|wma|wmv|asx|qt|rm|mkv|mka|ogm|ogg)(-.)" && ret=0
       if _requested urls; then
         while _next_label urls expl url; do
           _urls "$expl[@]" && ret=0
diff --git a/Completion/X/Command/_x_utils b/Completion/X/Command/_x_utils
index 183f5efb9..2e672fdc0 100644
--- a/Completion/X/Command/_x_utils
+++ b/Completion/X/Command/_x_utils
@@ -24,25 +24,25 @@ xfontsel)
   _xt_arguments \
     -{print,noscaled} \
     '-pattern:font pattern:_x_font' \
-    '-sample:sample text:' \
-    '-sample16:16-bit sample text:'
+    '-sample:sample text' \
+    '-sample16:16-bit sample text'
   ;;
 xfd)
   _xt_arguments \
     '-fn:font: _x_font' \
     -{box,center} \
-    '-start:first character number:' \
+    '-start:first character number' \
     '-bc:box border color:_x_color' \
-    '-rows:number of rows:' \
-    '-columns:number of columns:'
+    '-rows:number of rows' \
+    '-columns:number of columns'
   ;;
 xev)
   _x_arguments \
-    '-bw:border width:' \
+    '-bw:border width' \
     '-bs:type of backing store:(NotUseful WhenMapped Always)' \
     '-id:id:_x_window' \
     '-s[use save-under]' \
-    '-name:window name:' \
+    '-name:window name' \
     '-rv'
   ;;
 xhost)
@@ -103,8 +103,8 @@ xhost)
 xon)
   _arguments \
     -{access,debug,nols} \
-    '-name:window name:' \
-    '-screen:screen number:' \
+    '-name:window name' \
+    '-screen:screen number' \
     '-user:remote user name:_users' \
     ':remote host:_hosts' \
     '(-):command: _command_names -e' \
@@ -113,20 +113,20 @@ xon)
 xsetroot)
   _x_arguments \
     -{help,def,gray,grey,rv} \
-    '-cursor:cursor file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\):mask file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\|mask\)' \
+    '-cursor:cursor file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\):mask file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\|mask\)\(-.\)' \
     '-cursor_name:cursor name:_x_cursor' \
-    '-bitmap:bitmap file:_files -g \*.\(\#i\)xbm' \
-    '-mod:x grid distance (1-16): :y grid distance (1-16):' \
+    '-bitmap:bitmap file:_files -g \*.\(\#i\)xbm\(-.\)' \
+    '-mod:x grid distance (1-16): :y grid distance (1-16)' \
     '-fg:foreground color:_x_color' \
     '-bg:background color:_x_color' \
     '-solid:screen solid color:_x_color' \
-    '-name:root window name:'
+    '-name:root window name'
   ;;
 xwd)
   _x_arguments \
     -{debug,help,nobdrs,xy,frame,root,icmap,screen,silent} \
     '-out:output file:_files' \
-    '-add:pixel change value:' \
+    '-add:pixel change value' \
     '-id:id: _x_window' \
     '-name:name: _x_window -n'
   ;;
@@ -135,8 +135,8 @@ xwud)
     -{help,new,noclick,raw,rv,scale} \
     '-bg:background color:_x_color' \
     '-fg:foreground color:_x_color' \
-    '-in:input file:_files -g \*.\(\#i\)xwd' \
-    '-plane:image plane to display:' \
+    '-in:input file:_files -g \*.\(\#i\)xwd\(-.\)' \
+    '-plane:image plane to display' \
     '-std:standard colormap:(best default gray red blue green)' \
     '-vis:visual:_x_visual'
   ;;
@@ -156,9 +156,9 @@ xrdb)
     '(-query -load -override -remove)-merge' \
     '(-query -load -override -merge)-remove' \
     '-edit:output file:_files' \
-    '-backup:backup extension:' \
-    '*-D-:symbol to define:' \
-    '*-U-:symbol to undefine:' \
+    '-backup:backup extension' \
+    '*-D-:symbol to define' \
+    '*-U-:symbol to undefine' \
     '*-I-:include directory:_files -/' \
     '*:defaults file:_files'
   ;;
diff --git a/Completion/X/Command/_xdvi b/Completion/X/Command/_xdvi
index 7a4461ae1..d55c99485 100644
--- a/Completion/X/Command/_xdvi
+++ b/Completion/X/Command/_xdvi
@@ -3,28 +3,28 @@
 _xt_arguments \
   -+{allowshell,copy,expert,hush{,chars,checksums,specials},keep,l,no{ghostscript,grey,gssafer,makepk,postscript,scan},safer,thorough,underlink,version} \
   +{altfont,base,browser,cr,debug,density,gamma,gspalette,hl,icongeometry,interpreter,margin,mfmode,offsets,p,paper,shrink,S,sidemargin,topmargin,xoffset,yoffset,grid{1,2,3},mgs{,1,2,3,4,5}} \
-  '-altfont:default font:' \
-  '-base:base URL:' \
+  '-altfont:default font' \
+  '-base:base URL' \
   '-browser:WWW browser:_command_names -e' \
   '-cr:cursor color:_x_color' \
   '-debug:debugging bitmask:((1\:bitmaps 2\:dvi\ translation 4\:pk\ reading 8\:batch\ operation 16\:events 32\:file\ opening 64\:PostScript\ communication 128\:Kpathsea\ statistics 256\:Kpathsea\ hash\ table\ lookups 512\:Kpathsea\ path\ definitions 1024\:Kpathsea\ path\ expansion 2048\:Kpathsea\ searches))' \
-  '-density:font shrink density:' \
-  '-gamma:anti-aliasing factor (default 1.0):' \
+  '-density:font shrink density' \
+  '-gamma:anti-aliasing factor (default 1.0)' \
   -grid{1,2,3}':grid color:_x_color' \
   '-gspalette:Ghostscript palette:(Color Greyscale Monochrome)' \
   '-hl:page highlight color:_x_color' \
   '-icongeometry:icon geometry:_x_geometry' \
   '-interpreter:Ghostscript program:_command_names -e' \
-  '-margin:margin size:' \
-  '-mfmode:metafont string:' \
-  -mgs{,1,2,3,4,5}':magnifier size:' \
-  '-offsets:offset size:' \
-  '-p:font size (pixel per inch):' \
+  '-margin:margin size' \
+  '-mfmode:metafont string' \
+  -mgs{,1,2,3,4,5}':magnifier size' \
+  '-offsets:offset size' \
+  '-p:font size (pixel per inch)' \
   '-paper:paper size (<width>x<height> or ...):(us usr legal foolscap a1 a2 a3 a4 a5 a6 a7 b1 b2 b3 b4 b5 b6 b7 c1 c2 c3 c4 c5 c6 c7 a1r a2r a3r a4r a5r a6r a7r)' \
-  '-shrink:shrink factor:' \
-  '-S:font shrink density:' \
-  '-sidemargin:side margin:' \
-  '-topmargin:top margin:' \
-  '-xoffset:horizontal offset:' \
-  '-yoffset:vertical offset:' \
-  '*:DVI file:_files -g \*.\(\#i\)dvi\(\|.Z\|.gz\|.bz2\)'
+  '-shrink:shrink factor' \
+  '-S:font shrink density' \
+  '-sidemargin:side margin' \
+  '-topmargin:top margin' \
+  '-xoffset:horizontal offset' \
+  '-yoffset:vertical offset' \
+  '*:DVI file:_files -g "*.(#i)dvi(|.Z|.gz|.bz2)(-.)"'
diff --git a/Completion/X/Command/_xfig b/Completion/X/Command/_xfig
index cc216a7b4..4d1e38f5f 100644
--- a/Completion/X/Command/_xfig
+++ b/Completion/X/Command/_xfig
@@ -4,31 +4,31 @@ _x_arguments \
   -{help,Landscape,Portrait,debug,dontswitchcmap,flushleft,inches,inverse,latexfonts,left,metric,monochrome,multiple,noscalablefonts,notrack,right,scalablefonts,showallbuttons,single,specialtext,tablet,track} \
   '-bold:bold font:_x_font' \
   '-button:button font:_x_font' \
-  '-but_per_row:number of buttons:' \
+  '-but_per_row:number of buttons' \
   '-cbg:canvas background color:_x_color' \
   '-cfg:canvas foreground color:_x_color' \
-  '-depth:visual depth:' \
+  '-depth:visual depth' \
   '-exportlanguage:export language:(box latex epic eepic eepicemu pictex ibmgl eps ps pstex textyl tpic pic mf acad pcx png gif jpeg tiff ppm xbm xpm)' \
   '-iconGeometry:icon geometry:_x_geometry' \
-  '-internalBW:internal border width:' \
+  '-internalBW:internal border width' \
   '-keyfile:compose key file:_files' \
-  '-magnification:magnification factor:' \
-  '-max_image_colors:maximum number of colors:' \
+  '-magnification:magnification factor' \
+  '-max_image_colors:maximum number of colors' \
   '-normal:normal font:_x_font' \
   '-papersize:output paper size:((Letter\:8.5\"\ x\ 11\" Legal\:8.5\"\ x\ 14\" Ledger\:17\"\ x\ 11\" Tabloid\:11\"\ x\ 17\" A\:8.5\"\ x\ 11\" B\:11\"\ x\ 17\" C\:17\"\ x\ 22\" D\:22\"\ x\ 34\" E\:34\"\ x\ 44\" A4\:21\ cm\ x\ 29.7\ cm A3\:29.7\ cm\ x\ 42\ cm A2\:42\ cm\ x\ 59.4\ cm A1\:59.4\ cm\ x\ 84.1\ cm A0\:84.1\ cm\ x\ 118.9\ cm B%\:18.2\ cm\ x\ 25.7\ cm))' \
-  '-pheight:canvas height:' \
-  '-pwidth:canvas width:' \
+  '-pheight:canvas height' \
+  '-pwidth:canvas width' \
   '-spellcheckcommand:program: _command_names -e' \
-  '-startfillstyle:fill style (-1 to 21):' \
-  '-startfontsize:font size (in points):' \
+  '-startfillstyle:fill style (-1 to 21)' \
+  '-startfontsize:font size (in points)' \
   '-startgridmode:grid mode:((0\:no\ grid 1\:1/4\ inch\ or\ 5\ mm 2\:1/2\ inch\ or\ 1\ cm 3\:1\ inch\ or\ 2\ cm))' \
-  '-startlatexfont:latex font:' \
-  '-startlinewidth:line width:' \
+  '-startlatexfont:latex font' \
+  '-startlinewidth:line width' \
   '-startposnmode:positioning mode:((0\:any 1\:1/16\ inch\ or\ 1\ mm 2\:1/4\ inch\ or\ 5\ mm 3\:1/2\ inch\ or\ 1\ cm 4\:1\ inch\ or\ 2\ cm))' \
-  '-startpsfont:postscript font:' \
-  '-starttextstep:text step:' \
-  '-userscale:scale factor:' \
-  '-userunit:unit string:' \
+  '-startpsfont:postscript font' \
+  '-starttextstep:text step' \
+  '-userscale:scale factor' \
+  '-userunit:unit string' \
   '-visual:visual:_x_visual' \
-  '-zoom:zoom scale:' \
-  '*:xfig file:_files -g \*.\(\#i\)\(\|x\)fig'
+  '-zoom:zoom scale' \
+  '*:xfig file:_files -g "*.(#i)(|x)fig(-.)"'
diff --git a/Completion/X/Command/_xloadimage b/Completion/X/Command/_xloadimage
index 5763385e8..c7c628e4a 100644
--- a/Completion/X/Command/_xloadimage
+++ b/Completion/X/Command/_xloadimage
@@ -46,7 +46,7 @@ _x_arguments "$args[@]" \
   '-default[set root background to default]' \
   '-fit[use default visual and colormap]' \
   '-fullscreen[use whole screen, surrounding image with border]' \
-  "-goto[specify image to display at end]:image name:_files -W ipath -g '*(#i)(${(j:|:)extension})(|${(j:|:)filters})'" \
+  "-goto[specify image to display at end]:image name:_files -W ipath -g '*(#i)(${(j:|:)extension})(|${(j:|:)filters})(-.)'" \
   '(*)-help[display information on options]' \
   '-identity[identify supplied images instead of displaying]' \
   '-install[forcibly install image colormap on focus]' \
@@ -84,7 +84,7 @@ _x_arguments "$args[@]" \
   '*-halftone[force halftone dithering]' \
   '*-invert[invert a monochrome image]' \
   '*-merge[merge image onto the base image]' \
-  "*-name[specify image name]:picture file:_files -W ipath -g '*(#i)(${(j:|:)extension})(|${(j:|:)filters})'" \
+  "*-name[specify image name]:picture file:_files -W ipath -g '*(#i)(${(j:|:)extension})(|${(j:|:)filters})(-.)'" \
   '*-normalize' \
   '*-rotate[rotate image clockwise]:degrees of rotation:(90 180 270)' \
-  "*:picture file:_files -W ipath -g '*(#i)(${(j:|:)extension})(|${(j:|:)filter})'"
+  "*:picture file:_files -W ipath -g '*(#i)(${(j:|:)extension})(|${(j:|:)filter})(-.)'"
diff --git a/Completion/X/Command/_xv b/Completion/X/Command/_xv
index 1a4523eb6..513a953dc 100644
--- a/Completion/X/Command/_xv
+++ b/Completion/X/Command/_xv
@@ -7,11 +7,11 @@ _x_arguments \
   '-bg:background color:_x_color' \
   '-hi:top left shadow color:_x_color' \
   '-lo:bottom right shadow color:_x_color' \
-  '-bw:border width:' \
+  '-bw:border width' \
   '-geometry:geometry:_x_geometry' \
-  '-expand:expansion factor:' \
-  '-aspect:aspect ratio (e.g. 4:3):' \
-  '-ncols:maximum number of colors used:' \
+  '-expand:expansion factor' \
+  '-aspect:aspect ratio (e.g. 4:3)' \
+  '-ncols:maximum number of colors used' \
   '-rmode:root display mode:((0\:tiling 1\:integer\ tiling 2\:mirrored\ tiling 3\:integer\ mirrored\ tiling 4\:centered\ tiling 5\:centered\ tiling\ on\ solid\ background 6\:centered\ tiling\ on\ '\\\''warp'\\\''\ background 7\:centered\ tiling\ on\ '\\\''brick'\\\''\ background 8\:symmetrical\ tiling 9\:symmetrical\ mirrored\ tiling))' \
   '-rfg:root foreground color:_x_color' \
   '-rbg:root background color:_x_color' \
@@ -21,25 +21,25 @@ _x_arguments \
   '-cmtgeometry:comments window geometry:_x_geometry' \
   '-tgeometry:text view window geometry:_x_geometry' \
   '-vsgeometry:visual schauzer geometry:_x_geometry' \
-  '-crop:left border: :top border: :width: :height:' \
+  '-crop:left border: :top border: :width: :height' \
   '-rotate:rotation angle:(0 90 -90 +90 180 -180 +180 270 -270 +270)' \
-  '-gamma:gamma value:' \
-  '-cgamma:red gamma value: :green gamma value: :blue gamma value:' \
+  '-gamma:gamma value' \
+  '-cgamma:red gamma value: :green gamma value: :blue gamma value' \
   '-preset:default preset (1-4):(1 2 3 4)' \
   '-white:'"'"'white'"'"' color:_x_color' \
   '-black:'"'"'black'"'"' color:_x_color' \
-  '-wait:seconds to wait:' \
+  '-wait:seconds to wait' \
   '-visual:visual:_x_visual' \
-  '-cursor:cursor character number:' \
+  '-cursor:cursor character number' \
   '-icgeometry:icon geometry:_x_geometry' \
   '-dir:directory:_files -/' \
   '-flist:file list file:_files' \
-  '-drift:x movement correction: :y movement correction:' \
+  '-drift:x movement correction: :y movement correction' \
   '-mfn:mono spaced font:_x_font' \
   '-name:window name:_x_name' \
-  '-+grabdelay:grab delay (seconds):' \
-  '-gsdev:ghostscript device:' \
-  '-gsres:ghostscript resolution:' \
-  '-gsgeom:ghostscript page size:' \
-  '-DEBUG:debug level:' \
-  '*:picture file:_files -g \*.\(\#i\)\(png\|gif\|jpeg\|jpg\|tiff\|tif\|pbm\|pgm\|ppm\|xbm\|xpm\|ras\(\|t\)\|tga\|rle\|rgb\|bmp\|pcx\|fits\|pm\)'
+  '-+grabdelay:grab delay (seconds)' \
+  '-gsdev:ghostscript device' \
+  '-gsres:ghostscript resolution' \
+  '-gsgeom:ghostscript page size' \
+  '-DEBUG:debug level' \
+  '*:picture file:_files -g \*.\(\#i\)\(png\|gif\|jpeg\|jpg\|tiff\|tif\|pbm\|pgm\|ppm\|xbm\|xpm\|ras\(\|t\)\|tga\|rle\|rgb\|bmp\|pcx\|fits\|pm\)\(-.\)'
diff --git a/Completion/X/Command/_xwit b/Completion/X/Command/_xwit
index 5c6a7f650..eb616adac 100644
--- a/Completion/X/Command/_xwit
+++ b/Completion/X/Command/_xwit
@@ -62,9 +62,9 @@ _regex_arguments _xwit_parse \
   \| "/-iconname$nul/" "$guard" \
      "/$word/" ':option-name:iconname:_x_name' \
   \| "/-bitmap$nul/" "$guard" \
-     "/$word/" ':option-bitmap:bitmap file:_files -g *.xbm' \
+     "/$word/" ':option-bitmap:bitmap file:_files -g *.xbm\(-.\)' \
   \| "/-mask$nul/" "$guard" \
-     "/$word/" ':option-mask:mask file:_files -g *.xbm' \
+     "/$word/" ':option-mask:mask file:_files -g *.xbm\(-.\)' \
   \| "/-iconmove$nul/" "$guard" \
      "/$word/" ':option-iconmove-x:x:' \
      "/$word/" ':option-iconmove-y:y:' \