5 files changed, 77 insertions, 39 deletions
diff --git a/Completion/User/_gdb b/Completion/User/_gdb
index 54213a08a..57914773c 100644
--- a/Completion/User/_gdb
+++ b/Completion/User/_gdb
@@ -21,9 +21,10 @@ elif compset -P '-(symbols|core|command)='; then
   _files
 elif [[ "$PREFIX" = -* ]]; then
   _description expl option
-  compadd "$expl[@]" -QS '' - symbols\= exec\= se\= core\= command\= \
-                              directory\= cd\= tty\=
-  compadd "$expl[@]" - help h s e c x d nx n quiet q batch fullname f b
+  compadd "$expl[@]" -QS '' - -symbols\= -exec\= -se\= -core\= -command\= \
+                              -directory\= -cd\= -tty\=
+  compadd "$expl[@]" - -help -h -s -e -c -x -d -nx -n -quiet -q -batch \
+                       -fullname -f -b
 else
   prev="$words[CURRENT-1]"
 
diff --git a/Completion/User/_gprof b/Completion/User/_gprof
index 0a1d621be..66354c875 100644
--- a/Completion/User/_gprof
+++ b/Completion/User/_gprof
@@ -5,8 +5,8 @@ _arguments -s -{a,b,c,D,h,i,l,L,s,T,v,w,x,y,z} \
 	   '-I:directory:_dir_list' \
 	   '-d-:debug level:' '-k:function names: _exec_funcs -p' \
 	   '-m:minimum execution count:' \
-	   ':executable:_files -g *(*)' \
-	   ':profile file:_files -g gmon.*' \
+	   ':executable:_files -g \*\(\*\)' \
+	   ':profile file:_files -g gmon.\*' \
 	   -- -s '(#--[no-] --)' \
            '*=name*:function name: _exec_funcs' \
 	   '*=dirs*:directory:_dir_list'
diff --git a/Completion/User/_x_options b/Completion/User/_x_options
index fd8d2034e..23243002c 100644
--- a/Completion/User/_x_options
+++ b/Completion/User/_x_options
@@ -1,12 +1,6 @@
 #compdef -P */X11/*
 
-local expl
-
-# A simple pattern completion, just as an example.
-
-if [ "$words[CURRENT-1]" = "-display" ]; then
-  _x_display
-else
-  _description expl option  
-  compadd "$expl[@]" - -display -name -xrm
-fi
+_arguments \
+  '-display:display:_x_display' \
+  '-geometry:geometry:_x_geometry' \
+  "$@"
diff --git a/Completion/User/_xfig b/Completion/User/_xfig
index f1c2ca6f5..2dd7f94f2 100644
--- a/Completion/User/_xfig
+++ b/Completion/User/_xfig
@@ -1,6 +1,55 @@
 #compdef xfig
 
-local expl
-
-_description expl 'xfig file'
-_files "$expl[@]" -g '*.fig'
+_x_options \
+  '-help' \
+  '-Landscape' \
+  '-Portrait' \
+  '-bold:bold font:_x_font' \
+  '-button:button font:_x_font' \
+  '-but_per_row:number of buttons:' \
+  '-cbg:canvas background color:_colors' \
+  '-cfg:canvas foreground color:_colors' \
+  '-debug' \
+  '-depth:visual depth:_x_visdepth' \
+  '-dontswitchcmap' \
+  '-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)' \
+  '-flushleft' \
+  '-iconGeometry:icon geometry:_x_geometry' \
+  '-inches' \
+  '-internalBW:internal border width:' \
+  '-inverse' \
+  '-keyfile:compose key file:_files' \
+  '-latexfonts' \
+  '-left' \
+  '-magnification:magnification factor:' \
+  '-max_image_colors:maximum number of colors:' \
+  '-metric' \
+  '-monochrome' \
+  '-multiple' \
+  '-normal:normal font:_x_font' \
+  '-noscalablefonts' \
+  '-notrack' \
+  '-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:' \
+  '-right' \
+  '-scalablefonts' \
+  '-showallbuttons' \
+  '-single' \
+  '-specialtext' \
+  '-spellcheckcommand:program: _command_names -e' \
+  '-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:' \
+  '-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:' \
+  '-tablet' \
+  '-track' \
+  '-userscale:scale factor:' \
+  '-userunit:unit string:' \
+  '-visual:visual:(TrueColor StaticColor DirectColor StaticGray GrayScale PseudoColor)' \
+  '-zoom:zoom scale:' \
+  '*:xfig file:_files -g \*.\(\#i\)\(\|x\)fig'
diff --git a/Completion/User/_xsetroot b/Completion/User/_xsetroot
index adce06d08..c3440a8ee 100644
--- a/Completion/User/_xsetroot
+++ b/Completion/User/_xsetroot
@@ -1,22 +1,16 @@
 #compdef xsetroot
 
-local expl
-
-case "$words[CURRENT-1]" in
--cursor_name) _cursors; return;;
--([fb]g|solid)) _colors; return;;
--cursor) _description expl 'cursor file'
-         _files "$expl[@]" -/g '*.(#i)(xbm|curs(|or))'; return;;
--bitmap) _description expl 'bitmap file'
-         _files "$expl[@]" -/g '*.(#i)xbm'; return;;
-esac
-
-if [[ CURRENT -gt 2 && "$words[CURRENT-2]" = -cursor ]]; then
-  _description expl 'cursor mask file'
-  _files "$expl[@]" -/g '*.(#i)(xbm|curs(|or)|mask)'
-else
-  _description expl option
-  compadd "$expl[@]" -M 'm:-=_ r:|_=*' - \
-          -help -def -cursor -cursor_name -bitmap -mod -gray -grey \
-          -fg -bg -rv -solid -name
-fi
+_x_options \
+  '-help' \
+  '-def' \
+  '-cursor:cursor file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\):mask file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\|mask\)' \
+  '-cursor_name:cursor name:_cursors' \
+  '-bitmap:bitmap file:_files -g \*.\(\#i\)xbm' \
+  '-mod:x grid distance (1-16): :y grid distance (1-16):' \
+  '-gray' \
+  '-grey' \
+  '-fg:foreground color:_colors' \
+  '-bg:background color:_colors' \
+  '-rv' \
+  '-solid:screen solid color:_colors' \
+  '-name:root window name:'