Merge branch 'upstream' into debian

12 files changed, 181 insertions, 334 deletions

diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index fe810e1c4..f03668b3a 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -1,278 +1,2 @@
 DISTFILES_SRC='
-.distfiles
-_a2ps
-_aap
-_adb
-_ant
-_antiword
-_apachectl
-_apm
-_arp
-_arping
-_at
-_attr
-_awk
-_baz
-_bison
-_bittorrent
-_bogofilter
-_bpython
-_bzip2
-_bzr
-_cal
-_calendar
-_cat
-_ccal
-_cdcd
-_cdrdao
-_cdrecord
-_chkconfig
-_chmod
-_chown
-_clay
-_comm
-_compress
-_configure
-_cowsay
-_cp
-_cpio
-_cplay
-_cssh
-_cut
-_cvs
-_darcs
-_date
-_dbus
-_dd
-_devtodo
-_df
-_dhclient
-_dict
-_diff
-_diffstat
-_django
-_dmidecode
-_du
-_dvi
-_ecasound
-_elinks
-_elm
-_enscript
-_env
-_espeak
-_etags
-_fakeroot
-_feh
-_fetchmail
-_ffmpeg
-_figlet
-_find
-_finger
-_flasher
-_flex
-_fortune
-_fsh
-_fuser
-_gcc
-_gdb
-_genisoimage
-_getconf
-_getent
-_getfacl
-_getmail
-_git
-_global
-_gnu_generic
-_gnupod
-_gnutls
-_go
-_gpg
-_gphoto2
-_gprof
-_gradle
-_graphicsmagick
-_grep
-_groff
-_growisofs
-_gs
-_guilt
-_gzip
-_hg
-_iconv
-_id
-_ifconfig
-_iftop
-_imagemagick
-_init_d
-_initctl
-_ip
-_irssi
-_ispell
-_java
-_joe
-_join
-_killall
-_knock
-_kvno
-_last
-_ldd
-_less
-_lha
-_links
-_ln
-_loadkeys
-_locate
-_look
-_lp
-_ls
-_lsof
-_lynx
-_lzop
-_mail
-_make
-_man
-_md5sum
-_mencal
-_metaflac
-_mh
-_mkdir
-_module
-_monotone
-_moosic
-_mosh
-_mount
-_mpc
-_mt
-_mtools
-_mtr
-_mutt
-_mysql_utils
-_mysqldiff
-_ncftp
-_netcat
-_nice
-_nkf
-_nm
-_nmap
-_notmuch
-_npm
-_nslookup
-_od
-_pack
-_patch
-_pax
-_pbm
-_perforce
-_perl
-_perldoc
-_pgrep
-_php
-_pine
-_ping
-_pkg-config
-_pkg_instance
-_pkgadd
-_pkginfo
-_pkgrm
-_pon
-_postfix
-_prcs
-_printenv
-_prove
-_psutils
-_pump
-_pydoc
-_python
-_qemu
-_quilt
-_raggle
-_rake
-_ranlib
-_rar
-_rcs
-_renice
-_ri
-_rlogin
-_rm
-_rrdtool
-_rsync
-_rubber
-_ruby
-_sablotron
-_samba
-_sccs
-_screen
-_sed
-_service
-_setfacl
-_sh
-_showmount
-_sisu
-_slrn
-_socket
-_sort
-_spamassassin
-_sqlite
-_sqsh
-_ssh
-_stgit
-_strip
-_stty
-_su
-_subversion
-_sudo
-_surfraw
-_sysctl
-_systemd
-_tar
-_tardy
-_tcpdump
-_tcptraceroute
-_telnet
-_tex
-_texinfo
-_tidy
-_tiff
-_tin
-_tla
-_tmux
-_todo.sh
-_toilet
-_topgit
-_totd
-_tracepath
-_tree
-_twidge
-_twisted
-_unace
-_uname
-_unexpand
-_uniq
-_unison
-_units
-_user_admin
-_uzbl
-_vcsh
-_vim
-_vorbis
-_vorbiscomment
-_vux
-_w3m
-_webbrowser
-_wget
-_whereis
-_whois
-_wiggle
-_xargs
-_xmlsoft
-_xmms2
-_xz
-_yafc
-_yodl
-_yp
-_zcat
-_zdump
-_zfs
-_zip
-_zpool
 '
diff --git a/Completion/Unix/Command/_chsh b/Completion/Unix/Command/_chsh
new file mode 100644
index 000000000..97552e3ac
--- /dev/null
+++ b/Completion/Unix/Command/_chsh
@@ -0,0 +1,40 @@
+#compdef chsh chpass
+case $OSTYPE in
+(darwin*|*bsd*)
+  _arguments : \
+      '-s[Specify user login shell]:shell:(${(Z+Cn+)"$(</etc/shells)"})' \
+      "-l[Specify location of user]:node:" \
+      "-u[Specify authentication name]:auth user:" \
+      "1:user name:_users"
+  ;;
+(linux-gnu)
+  if { =chsh -v } >&/dev/null
+  then
+      local -a opts shells
+      shells=( $(=chsh -l) )
+      _arguments : \
+	  "(-)-s[Specify your login shell]:shell:($shells)" \
+	  "(-)--shell[Specify your login shell]:shell:($shells)" \
+	  "(-)-l[Print shells in /etc/shells]" \
+	  "(-)--list-shells[Print shells in /etc/shells]" \
+	  "(-)-u[Print a usage message and exit]" \
+	  "(-)--help[Print a usage message and exit]" \
+	  "(-)-v[Print version information and exit]" \
+	  "(-)--version[Print version information and exit]" \
+	  "1:user name:_users"
+      return
+  fi
+  # else fall through
+  ;&
+(*)
+  local s=''
+  # Use $s to cause all options to be treated as mutually exclusive
+  [[ $words[CURRENT-1] = -* ]] && s="(-)$words[CURRENT-1]"
+  # This fiddling with $s is a hack to cause "_arguments  : --" to use
+  # the /etc/shells listing for -s or --shell even when the description
+  # of that option has been pulled from the GNU --help output.
+  [[ $words[CURRENT-1] = (-s|--shell) ]] &&
+    s="$s"'[ ]:shell:(${(Z+Cn+)"$(</etc/shells)"})'
+  _arguments : $s "1:user name:_users" --
+  ;;
+esac
diff --git a/Completion/Unix/Command/_dsh b/Completion/Unix/Command/_dsh
new file mode 100644
index 000000000..688e024ce
--- /dev/null
+++ b/Completion/Unix/Command/_dsh
@@ -0,0 +1,33 @@
+#compdef dsh
+
+local curcontext="$curcontext" state line expl
+typeset -A opt_args
+
+_arguments -s -C -S \
+  '(-v --verbose -q --quiet)'{-v,--verbose}'[verbose output]' \
+  '(-q --quiet -v --verbose)'{-q,--quiet}'[quieter output]' \
+  '(-M --show-machine-names)'{-M,--show-machine-names}'[prepend the host name on output]' \
+  '(-i --duplicate-input)'{-i,--duplicate-input}'[duplicate input given to dsh]' \
+  '(-b --bufsize)'{-b,--bufsize}'[change buffer size used in input duplication]:buffer size for -i (bytes)' \
+  '(-m --machine)'{-m,--machine}'[execute on machine]:machine:{_hosts || _user_at_host}' \
+  '(-n --num-topology)'{-n,--num-topology}'[how to divide the machines]:number' \
+  '(-a --all)'{-a,--all}'[execute on all machines]' \
+  '(-g --group)'{-g,--group}'[execute on group member]:groupname:->groups' \
+  '(-f --file)'{-f,--file}'[use the file as list of machines]:file:_files' \
+  '(-r --remoteshell)'{-r,--remoteshell}'[execute using shell]:remote shell:(rsh ssh)' \
+  '(-o --remoteshellopt)'{-o,--remoteshellopt}'[option to give to remote shell ]:option' \
+  '(-)'{-h,--help}'[display help information]' \
+  '(-w --wait-shell -c --concurrent-shell)'{-w,--wait-shell}'[sequentially execute shell]' \
+  '(-c --concurrent-shell -w --wait-shell)'{-c,--concurrent-shell}'[execute shell concurrently]' \
+  '(-F --forklimit)'{-F,--forklimit}'[concurrent with limit on number]:fork limit' \
+  '(-)'{-V,--version}'[display version information]' \
+  '*::args: _normal' && return
+
+if [[ $state = groups ]]; then
+  if ! zstyle -s ":completion:$curcontext:dsh-groups" dsh-groups grp; then
+    [[ -e ~/.dsh/group ]] && grp="~/.dsh/group" || return 1
+  fi
+  _path_files -W ~/.dsh/group && return
+fi
+
+return 1
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 7cd3324a8..b1f411a5e 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6224,8 +6224,8 @@ __git_setup_merge_options () {
     '--ff-only[refuse to merge unless HEAD is up to date or merge can be resolved as a fast-forward]'
     '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
     '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
-    '(--verify-signatures)--no-verify-signatures[verify the commits being merged or abort]'
-    '(--no-verify-signatures)--verify-signatures[do not verify the commits being merged]'
+    '(--verify-signatures)--verify-signatures[verify the commits being merged or abort]'
+    '(--no-verify-signatures)--no-verify-signatures[do not verify the commits being merged]'
     '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress all output]'
     '(-q --quiet -v --verbose)'{-v,--verbose}'[output additional information]')
 }
diff --git a/Completion/Unix/Command/_mosh b/Completion/Unix/Command/_mosh
index c940f9015..dacbd1018 100644
--- a/Completion/Unix/Command/_mosh
+++ b/Completion/Unix/Command/_mosh
@@ -1,12 +1,26 @@
 #compdef mosh
 
+local curcontext="$curcontext" state line
+local -a suf
+
 _arguments \
-  '--client=:client helper:_command_names -e' \
-  '--server=:server helper:_files' \
-  '--ssh=:ssh command to run:_files' \
-  '(-a -n)--predict=:when:(adaptive always never)' \
-  '(--predict -n)-a[predict always]' \
-  '(--predict -a)-n[predict never]' \
-  {-p,--port=}':port:_ports' \
-  ':remote:_hosts' \
-  ':remote command:_command_names -e'
+  '(-)--help[display help information]' \
+  '(-)--version[display version information]' \
+  "--no-init[don't set terminal init string]" \
+  '--ssh=[specify ssh command to setup session]:ssh command:_normal' \
+  '--port=[specify server-side port range]:port:_sequence -n 2 -s \: _ports' \
+  '(-a -n)--predict=[control speculative local echo]:mode:(adaptive always never)' \
+  '(--predict -n)-a[synonym for --predict=always]' \
+  '(--predict -a)-n[synonym for --predict=never]' \
+  '--server[specify command to run server helper]:remote file:_files' \
+  '--client[specify command to run client helper]:_command_names -e' \
+  '1:remote host name:->userhost' \
+  '*:::args:_normal' && return
+
+case $state in
+  userhost)
+    _hosts || _user_at_host && return
+  ;;
+esac
+
+return 1
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index 542154a58..04282225f 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -688,7 +688,7 @@ if [[ "$service" = mount ]]; then
       "($excl -r -w --rw)"{-w,--rw}'[mount read/write]'
       "($excl)-L+[mount partition with specified label]:label:->labels"
       "($excl)-U+[mount partition with specified uuid]:uuid"
-      "($excl -t --types)"{-t+,--types=}'[specify file system type]:file system type:->fslist'
+      "($excl -t --types)"{-t+,--types=}'[specify file system type]:file system type:_sequence -s , _file_systems'
       "($excl -O --test-opts)"{-O+,--test-opts=}'[with -a, restrict filesystems by options]:file system option:->fsopt'
       "($excl -a -O -o --options)"{-o+,--options=}'[specify file system options]:file system option:->fsopt'
       '(: -)'{-B,--bind}'[remount part of filesystem elsewhere]:old directory:_directories:new directory:_directories'
@@ -743,7 +743,7 @@ if [[ "$service" = mount ]]; then
       '-o[specify file system options]:file system option:->fsopt'
       '-p[print mounted file systems]'
       '-r[mount readonly]'
-      '-t[specify file system type]:file system type:->fslist'
+      '-t[specify file system type]:file system type:_sequence -s, _file_systems'
       '-u[change status of already mounted filesystem]'
       '-v[verbose mode]'
       '-w[mount read/write]'
@@ -817,7 +817,7 @@ else
 	'-A[unmount all mounted file systems except the root]'
 	'-f[force unmount]'
 	'-h[unmount all filesystems associated with host]:host:_hosts'
-	'-t[unmount all filesystems of specified type]:file system type:->fslist'
+	'-t[unmount all filesystems of specified type]:file system type:_sequence -s, _file_systems'
 	'-v[verbose mode]'
 	'*:dev or dir:->udevordir'
       )
@@ -846,11 +846,6 @@ else
 fi
 
 case "$state" in
-fslist)
-  compset -P '*,'
-  compset -S ',*' || suf=','
-  _file_systems -qS "$suf"
-;;
 fsopt)
   _tags options || return 1
 
diff --git a/Completion/Unix/Command/_nm b/Completion/Unix/Command/_nm
index 3ceb8c932..6c95a0d85 100644
--- a/Completion/Unix/Command/_nm
+++ b/Completion/Unix/Command/_nm
@@ -1,30 +1,62 @@
 #compdef nm
 
-# This is a stub.  It's main reason for existence is to offer
-# object files with nm.  Feel free to extend it.  If you do, remove
-# this comment.
+local args files
 
-local state context line expl
-local -A opt_args
-local -a args
-integer ret=1
+_nm_object_file() {
+  [[ -x $REPLY || $REPLY = *.([ao]|so) ]]
+}
 
-if _pick_variant gnu='Free Soft' unix --version; then
-  args+=(-s --)
-fi
-args+=('*:file:->file')
-
-_arguments "$args[@]" && ret=0
+files="*:object file:_path_files -g '*(-.e:_nm_object_file:)'"
+args=(
+  '(-A -o --print-file-name)'{-A,-o,--print-file-name}'[print name of input file on each line]'
+  '(--demangle)-C[decode symbol names]'
+  '(-D --dynamic)'{-D,--dynamic}'[display dynamic symbols instead of normal ones]'
+  '(-g --extern-only)'{-g,--extern-only}'[display only global symbols]'
+  '(-t --radix -o -x)'{-t,--radix}'[specify radix for numeric values]:radix:((d\:decimal o\:octal x\:hexadecimal))'
+)
 
-case $state in
-  (file)
-  _alternative \
-    "object-files:object file:_path_files -g '*.o'" \
-    "executable-files:executable file:_path_files -g '*(*)'" \
-    "dynamic-libraries:dynamic library:_path_files -g '*.so(.*)#'" \
-    "static-libraries:static library:_path_files -g '*.a'" \
-    "directories:directory:_path_files -g '*(/)'" && ret=0
-  ;;
-esac
+if _pick_variant gnu=GNU unix -V; then
+  compset -P '@' && files='*:options file:_files'
+  args+=(
+    '(- *)--help[display help information]'
+    '(- *)--version[display version information]'
+    '(-f --format -P --portability)-B[same as --format=bsd]'
+    '(-C --no-demangle)--demangle=-[decode symbol names]::style:(auto gnu lucid arm hp edg gnu-v3 java gnat)'
+    "(-C --demangle)--no-demangle[don't decode symbol names]"
+    '(-u --undefined-only)--defined-only[display only defined symbols]'
+    '(-f --format -P)'{-f+,--format=}'[specify output format]:format:(bsd sysv posix)'
+    '(-l --line-numbers)'{-l,--line-numbers}'[display source file and line numbers from debug information]'
+    '(-n --numeric-sort -p --no-sort --size-sort)'{-n,--numeric-sort}'[sort symbols numerically by address]'
+    '(-p --no-sort -n --numeric-sort -r -P --reverse-sort --size-sort)'{-p,--no-sort}'[do not sort symbols]'
+    '(-P --portability -B -f --format)'{-P,--portability}'[same as --format=posix]'
+    '(-r --reverse-sort -p --no-sort --size-sort)'{-r,--reverse-sort}'[reverse sort order]'
+    '--plugin[load specified plugin]:plugin'
+    '(-u --undefined-only --defined-only)'{-u,--undefined-only}'[display only undefined symbols]'
+    "--target=[target object format]:targets:(${${(@M)${(f)$(_call_program targets nm --help)}:#*supported targets:*}##*: })"
+    '(-a --debug-syms)'{-a,--debug-syms}'[display debugger-only symbols]'
+    '(-S --print-size)'{-S,--print-size}'[print size of defined symbols]'
+    '(-s --print-armap)'{-s,--print-armap}'[include index for symbols from archive members]'
+    '(-p --no-sort -n --numeric-sort -r)--size-sort[sort symbols by size]'
+    '--special-syms[include special symbols in the output]'
+    '--synthetic[display synthetic symbols as well]'
+  )
+else
+  # following flags are accurate for Solaris
+  args=( ${args:#(|*\)(\*|))-[o-]*}
+    "-h[don't display column headers]"
+    '-l[distinguish WEAK symbols with * character]'
+    '(-t -x)-o[print values in octal]'
+    '(-v)-n[sort symbols by name]'
+    '(-P)-p[produce parsable output]'
+    '(-p)-P[portable output format]'
+    '(-r)-R[print archive name, object file and symbol name]'
+    '-r[prepend name of input file to each symbol name]'
+    '-s[print section name instead of index]'
+    '-u[print undefined symbols only]'
+    '(-n)-v[sort external symbols by value]'
+    '-V[display version of the nm command]'
+    '(-o -t)-x[print values in hexadecimal]'
+  )
+fi
 
-return ret
+_arguments -s "$args[@]" $files
diff --git a/Completion/Unix/Command/_nmap b/Completion/Unix/Command/_nmap
index f23937abc..437e68b7d 100644
--- a/Completion/Unix/Command/_nmap
+++ b/Completion/Unix/Command/_nmap
@@ -22,7 +22,7 @@ _arguments -C \
   '-iR[scan random hosts]:num hosts' \
   '-p[specify ports to try]:port numbers' \
   '-F[scan only ports listed in services file]' \
-  '-D[perform decoy scan]:host list:->host-list' \
+  '-D[perform decoy scan]:host list:_sequence -s, _hosts' \
   '-S[specify source address]:address:_hosts' \
   '-e[specify interface to use]:network interface:_net_interfaces' \
   '-g[specify source port number]:port number' \
diff --git a/Completion/Unix/Command/_pgrep b/Completion/Unix/Command/_pgrep
index 3b180ab2d..95d0ea284 100644
--- a/Completion/Unix/Command/_pgrep
+++ b/Completion/Unix/Command/_pgrep
@@ -70,13 +70,9 @@ _arguments -s -w $arguments && ret=0
 
 case $state in
   (tty)
-    compset -P '*,'
-
-    local -a used ttys
-    used=(${(s:,:)IPREFIX})
-
+    local -a ttys
     ttys=( /dev/tty*(N) /dev/pts/*(N) )
-    _wanted tty expl 'terminal device' compadd -S ',' -q -F used ${ttys#/dev/}
+    _sequence -s , _wanted tty expl 'terminal device' compadd - ${ttys#/dev/}
     ;;
 
   (sid)
diff --git a/Completion/Unix/Command/_rsync b/Completion/Unix/Command/_rsync
index a531d7df6..7bad03a05 100644
--- a/Completion/Unix/Command/_rsync
+++ b/Completion/Unix/Command/_rsync
@@ -74,7 +74,8 @@ _rsync() {
   _arguments -s \
     '*'{-v,--verbose}'[increase verbosity]' \
     {--no-v,--no-verbose}'[turn off --verbose]' \
-    '--bwlimit=[limit I/O bandwidth]:KBytes (etc.) per second' \
+    '--bwlimit=[limit I/O bandwidth]:limit (KiB per second)' \
+    '--outbuf=[set output buffering]:buffering:(none line block)' \
     '--port=[specify alternate port number]:port:(873)' \
     '--address=[bind to the specified address]:bind address:_bind_addresses' \
     '(-T --temp-dir)'{-T,--temp-dir=}'[create temporary files in specified directory]:directory:_directories' \
@@ -213,6 +214,7 @@ _rsync() {
     '--protocol=[force an older protocol version to be used]:number' \
     '--info=[fine-grained informational verbosity]:comma-separated list' \
     '--debug=[fine-grained debug verbosity]:comma-separated list' \
+    '--msgs2stderr[special output handling for debugging]' \
     '--munge-links[munge symlinks to make them safer, but unusable]' \
     '--ignore-missing-args[ignore missing source args without error]' \
     '--delete-missing-args[delete missing source args from destination]' \
@@ -222,6 +224,7 @@ _rsync() {
     '*'{-M=,--remote-option=}'[send option to the remote side only]:option string' \
     '--preallocate[preallocate the full length of new files]' \
     '--iconv=[request charset conversion of filenames]:number' \
+    '--checksum-seed=:number' \
     '--read-batch=[read a batched update from the specified file]:file:_files'
 }
 
diff --git a/Completion/Unix/Command/_wget b/Completion/Unix/Command/_wget
index f709a0830..b8ca2fd93 100644
--- a/Completion/Unix/Command/_wget
+++ b/Completion/Unix/Command/_wget
@@ -14,6 +14,7 @@ _arguments -C -s \
   '(--quiet -q --verbose -v --no-verbose -nv)'{--quiet,-q}'[turn off output]' \
   '(--quiet -q --verbose -v --no-verbose -nv)'{--verbose,-v}'[turn on verbose output]' \
   '*-n+[turn off flags]:flags:->noflags' \
+  '--report-speed=:type:(bits)' \
   '(--input-file -i)'{--input-file=,-i+}'[specify input file]:file containing URLs:_files' \
   '(--force-html -F)'{--force-html,-F}'[treat input file as html]' \
   '(--base -B)'{--base=,-B+}'[prepend URL to relative links]:base URL:_urls' \
@@ -47,6 +48,7 @@ _arguments -C -s \
   '--prefer-family[connect first to addresses of specified family]:address family:(IPv6 IPv4 none)' \
   '(--http-user --ftp-user)--user[set both ftp and http user]:user' \
   '(--http-password --ftp-password)--password[set both ftp and http password]:password' \
+  '(--password --http-password --ftp-password)--ask-password:[prompt for passwords]' \
   '--no-iri[turn off IRI support]' \
   '--local-encoding=[specify local encoding for IRIs]:encoding' \
   '--remote-encoding=[specify default remote encoding]:encoding' \
@@ -56,12 +58,13 @@ _arguments -C -s \
   '(--directory-prefix -P)'{--directory-prefix=,-P+}'[specify prefix to save files to]:prefix:_files -/' \
   '--cut-dirs=:number:' \
   '(--user)--http-user=:user' \
-  '(--password)--http-password=:password' \
+  '(--password --ask-password)--http-password=:password' \
   '--no-cache[disallow server-cached data]' \
   '--default-page=[specify default page name, normally index.html]' \
   '(--adjust-extension -E)'{--adjust-extension,-E}'[save all HTML/CSS documents with proper extensions]' \
   "--ignore-length[ignore \`Content-Length' header field]" \
   '*--header=:string' \
+  '--max-redirect=:number' \
   '--proxy-user=:user' \
   '--proxy-password=:password' \
   '--referer=:URL:_urls' \
@@ -74,9 +77,14 @@ _arguments -C -s \
   '--keep-session-cookies[load and save session cookies]' \
   '--post-data=[use the POST method with specified data]:data to send' \
   '--post-file=[use the POST method; sending contents of a file]:file:_files' \
+  '--method=[use specified HTTP method]:method:(GET POST HEAD DELETE)' \
+  '(--body-file)--body-data=[send string as data]:string' \
+  '(--body-data)--body-file=[send contents of file]:file:_files' \
   '--content-disposition[honor the Content-Disposition header when choosing local file names]'  \
+  '--content-on-error[output received content on server errors]' \
   "--auth-no-challenge[send basic HTTP authentication without first waiting for server's challenge]" \
   '--secure-protocol=[choose secure protocol]:protocol:(SSLv2 SSLv3 TLSv1)' \
+  --https-only \
   "--no-check-certificate=[don't check the server certificate]" \
   '--certificate=[specify client certificate]:client certificate file:_files' \
   '--certificate-type=[specify client certificate type]:certificate type:(PEM DER)' \
@@ -87,22 +95,27 @@ _arguments -C -s \
   '--random-file[specify file with random data for seeding generator]:file:_files' \
   '--egd-file=[specify filename of EGD socket]:file:_files' \
   '(--user)--ftp-user=:user' \
-  '(--password)--ftp-password=:password' \
+  '(--password --ask-password)--ftp-password=:password' \
   "--no-remove-listing[don't remove \`.listing' files]" \
   '--no-glob[turn off FTP file name globbing]' \
   '--no-passive-ftp' \
-  '--retr-symlinks' \
   '--preserve-permissions[preserve remote file permissions with ftp]' \
+  '--retr-symlinks' \
+  '--warc-file=:file:_files' --warc-header=:string --warc-max-size=:number \
+  --warc-cdx --warc-dedup=:file:_files --no-warc-compression --no-warc-digests \
+  --no-warc-keep-log --warc-tempdir=:directory:_directories \
   '(--recursive -r)'{--recursive,-r}'[recurse subdirectories]' \
   '(--level -l)'{--level=,-l+}'[specify maximum recursion depth]:level' \
   '--delete-after' \
   '(--convert-links -k)'{--convert-links,-k}'[convert links to be relative]' \
+  '--backups=:max backups' \
   '(--backup-converted -K)'{--backup-converted,-K}'[backup files before conversion]' \
   '(--mirror -m -r -N -l)'{--mirror,-m}'[mirror (-r -N -l inf --no-remove-listing)]' \
   '(--page-requisites -p)'{--page-requisites,-p}'[get all images needed to display page]' \
   '--strict-comments[turn on strict (SGML) handling of HTML comments]' \
   '(--accept -A)'{--accept=,-A+}'[specify accepted extensions]:extensions' \
   '(--reject -R)'{--reject=,-R+}'[specify rejected extensions]:extensions' \
+  --{accept,reject}-regex=:regex '--regex-type=:regex type:(posix pcre)' \
   '(--domains -D)'{--domains=,-D+}'[specify accepted domains]:domains:_domains' \
   '--exclude-domains=:rejected domains:_domains' \
   '--follow-ftp' \
diff --git a/Completion/Unix/Command/_zip b/Completion/Unix/Command/_zip
index a6baa9757..171daf01e 100644
--- a/Completion/Unix/Command/_zip
+++ b/Completion/Unix/Command/_zip
@@ -104,11 +104,8 @@ fi
 
 case $state in
   suffixes)
-    compset -P '*:'
-    compset -S ':*' || suf=":."
     suffixes=( *.*(N:e) )
-    _wanted suffixes expl suffixes \
-	compadd -S "$suf" -r ": \t" .$^suffixes && return
+    _sequence -s : _wanted -x suffixes expl suffix compadd - .$^suffixes && return
   ;;
   files)
     if [[ $service = zip ]] && (( ! ${+opt_args[-d]} )); then