Merge tag 'zsh-5.7.1-test-3' into debian

Test release: 5.7.1-test-3

7 files changed, 23 insertions, 56 deletions

diff --git a/Completion/X/Command/_gv b/Completion/X/Command/_gv
index d4dbed089..cde8a1c1a 100644
--- a/Completion/X/Command/_gv
+++ b/Completion/X/Command/_gv
@@ -22,7 +22,6 @@ _arguments \
   '(--watch)--nowatch' \
   '(--noresize)--resize' \
   '(--resize)--noresize' \
-  '(--grayscale --color)--monochrome' \
   '(--monochrome --color)--grayscale' \
   '(--grayscale --color)--monochrome' \
   '(--landscape --seascape --upsidedown)--portrait' \
diff --git a/Completion/X/Command/_setxkbmap b/Completion/X/Command/_setxkbmap
index 486268ed7..882a6f939 100644
--- a/Completion/X/Command/_setxkbmap
+++ b/Completion/X/Command/_setxkbmap
@@ -23,7 +23,7 @@ _setxkbmap() {
     local -a arguments
 
     arguments=(
-        '-compat[compability map]:compability:_setxkbmap_compat'
+        '-compat[compatibility map]:compatibility:_setxkbmap_compat'
         '-config[configuration file]:configuration:_files'
         '-display[display]:display:_x_display'
         '-geometry[geometry component]:geometry:_setxkbmap_geometry'
diff --git a/Completion/X/Command/_vnc b/Completion/X/Command/_vnc
index 70b897e47..d60616f21 100644
--- a/Completion/X/Command/_vnc
+++ b/Completion/X/Command/_vnc
@@ -33,7 +33,7 @@ case $service in
 	'-ls[limit stack space to N Kb]:int:' \
 	'-nolock[disable the locking mechanism]' \
 	'-logo[enable logo in screen saver]' \
-	'-nolisten[dont listen on protocol]:protocol:(tcp)' \
+	"-nolisten[don't listen on protocol]:protocol:(tcp)" \
 	'-p[screen-saver pattern duration (minutes)]:time (minutes):' \
 	'-pn[accept failure to listen on all ports]' \
 	'-nopn[reject failure to listen on all ports]' \
@@ -61,7 +61,7 @@ case $service in
 	'-udpinputport[UDP port for keyboard/pointer data]:port:' \
 	'-rfbport[TCP port for RFB protocol]:port:' \
 	'-rfbwait[max time in ms to wait for RFB client]:time:' \
-	'-nocursor[dont put up a cursor]' \
+	"-nocursor[don't put up a cursor]" \
 	'-rfbauth[use authentication on RFB protocol]:passwd-file:_files' \
 	'-httpd[serve files via HTTP from here]:dir:_files -/' \
 	'-httpport[port for HTTP]:port:' \
@@ -71,7 +71,7 @@ case $service in
 	'-desktop[VNC desktop name (default x11)]:name:' \
 	'-alwaysshared[always treat new clients as shared]' \
 	'-nevershared[never treat new clients as shared]' \
-	'-dontdisconnect[dont disconnect existing clients for new non-shared connections]' \
+	"-dontdisconnect[don't disconnect existing clients for new non-shared connections]" \
 	'-viewonly[let clients only to view the desktop]' \
 	'-localhost[only allow connections from localhost]' \
 	'-interface[only bind to specified interface address]:ipaddr:' \
diff --git a/Completion/X/Command/_x_utils b/Completion/X/Command/_x_utils
index 13c5572af..4b98ec48e 100644
--- a/Completion/X/Command/_x_utils
+++ b/Completion/X/Command/_x_utils
@@ -150,9 +150,10 @@ xon)
   ;;
 xsetroot)
   _x_arguments \
-    -{help,def,gray,grey,rv} \
+    -{help,version,def,default,gray,grey,rv,reverse} \
     '-cursor:cursor file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\):mask file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\|mask\)\(-.\)' \
     '-cursor_name:cursor name:_x_cursor' \
+    '-xcf:cursor file:_files:size' \
     '-bitmap:bitmap file:_files -g \*.\(\#i\)xbm\(-.\)' \
     '-mod:x grid distance (1-16): :y grid distance (1-16)' \
     '-fg:foreground color:_x_color' \
diff --git a/Completion/X/Command/_xrandr b/Completion/X/Command/_xrandr
index 26d8cd082..67045b33d 100644
--- a/Completion/X/Command/_xrandr
+++ b/Completion/X/Command/_xrandr
@@ -46,6 +46,13 @@ _arguments -C \
   '*--rmmode:Mode name:' \
   "*--addmode:output:->outputs:name" \
   "*--delmode:output:->outputs:name" \
+  '--listproviders' \
+  '--setprovideroutputsource:provider: :source' \
+  '--setprovideroffloadsink:provider: :sink' \
+  '--listmonitors' \
+  '--listactivemonitors' \
+  '--setmonitor:name' \
+  '--delmonitor:name' \
   && return 0
 
 case $state in
diff --git a/Completion/X/Command/_xterm b/Completion/X/Command/_xterm
index 7619b280a..6d98985e7 100644
--- a/Completion/X/Command/_xterm
+++ b/Completion/X/Command/_xterm
@@ -1,12 +1,16 @@
 #compdef xterm
 
 _xt_arguments \
-  -+{ah,ai,aw,bc,bdc,cb,cm,cn,cu,dc,hf,ie,im,j,ls,mb,nul,pc,rw,s,sb,sf,si,sk,sp,t,u8,ulc,ut,vb,wc,wf,samename} \
-  -{version,help,132,leftbar,rightbar,C} \
+  -+{132,ah,ai,aw,bc,bdc,cb,cjk_width,cm,cn,cu,dc,fbb,fbx,fullscreen,hf,hm,hold,ie,im,itc,j,k8,l,lc,ls,maximized,mb,mesg,mk_width,nul,pc,pob,rvc,rw,s,samename,sb,sf,si,sk,sm,sp,t,u8,uc,ulc,ulit,ut,vb,wc,wf} \
+  -{version,help,leftbar,rightbar,C} \
+  '-report-'{charclass,colors,fonts} \
+  '-T:title' \
   '-b:inner border size:' \
+  '-baudrate:rate [38400]' \
   '-bcf:time text cursor is off when blinking (milliseconds):' \
   '-bcn:time text cursor is on when blinking (milliseconds):' \
   '-cc:character class:' \
+  '-class:string' \
   '-cr:text cursor color:_x_color' \
   '-e:program: _command_names -e:*::program arguments: _normal' \
   '-fa:font pattern:_xft_fonts' \
@@ -15,11 +19,14 @@ _xt_arguments \
   '-hc:background color for highlighted text:_x_color' \
   '-mc:multi-click threshold (milliseconds):' \
   '-ms:pointer cursor color:_x_color' \
+  '-n:icon name' \
   '-nb:margin bell number:' \
+  '-selbg:color:_x_color' \
+  '-selfg:color:_x_color' \
+  '-sh:scaling' \
   '-sl:save lines:' \
   '-ti:terminal ID:_terminals' \
   '-tm:terminal setting:' \
   '-tn:terminal type:' \
   '-ziconbeep:iconbeep (percent):' \
-  '-C' \
   '-S-:pseudo-terminal and file descriptor:'
diff --git a/Completion/X/Command/_zathura b/Completion/X/Command/_zathura
deleted file mode 100644
index ebd229909..000000000
--- a/Completion/X/Command/_zathura
+++ /dev/null
@@ -1,47 +0,0 @@
-#compdef zathura
-
-(( $+functions[_zathura_files] )) ||
-_zathura_files(){
-  local -a plugins_files
-  local plugins_dir
-  for plugins_dir in \
-    ${(Qv)opt_args[(i)-p|--plugins-dir]}(#qN) \
-    {/usr/local,/usr,}/lib/zathura(#qN)
-  do
-    plugins_files+=( $plugins_dir/*.so(N) )
-  done
-  if [[ -z "${plugins_files}" ]]; then
-    _files -g "(#i)*.pdf(-.)"
-    return
-  fi
-  local -a supported_filetypes
-  local pf
-  for pf in "${plugins_files[@]}"; do
-    if [[ $pf =~ "mupdf" ]]; then
-      supported_filetypes+="pdf"
-      supported_filetypes+="epub"
-      supported_filetypes+="xps"
-    elif [[ $pf =~ "poppler" ]]; then
-      supported_filetypes+="pdf"
-    else
-      supported_filetypes+="${pf:t:r}"
-    fi
-  done
-  _files -g "(#i)*.(${(j.|.)${(@u)supported_filetypes}})(-.)"
-}
-
-_arguments -s -S \
-  {-e,--reparent=}'[specify xid of window to reparent to]:xid:_x_window' \
-  {-c,--config-dir=}'[specify path to the config directory]:config directory:{_files -/}' \
-  {-d,--data-dir=}'[specify path to the data directory]:data directory:{_files -/}' \
-  {-p,--plugins-dir=}'[specify path to the directory containing plugins]:plugins directory:{_files -/}' \
-  {-w,--password=}"[specify a password for the document]:password: " \
-  {-P,--page=}'[open the document at the given page number]:page number: ' \
-  {-l,--log-level=}'[set log level]:log level:(debug info warning error)' \
-  {-x,--synctex-editor-command=}'[specify synctex editor command]:synctex editor command:_cmdstring' \
-  '--synctex-forward=[jump to the given position]:synctex position: ' \
-  '--synctex-pid=[specify pid of an instance having the correct file opened]:synctex pid:_pids' \
-  '--fork[fork into background]' \
-  '(- :)--version[display version string and exit]' \
-  '(- :)--help[display help and exit]' \
-  '*:file:_zathura_files'