diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Completion/Unix/Command/_cut | 74 | ||||
| -rw-r--r-- | Completion/Unix/Command/_sed | 2 | ||||
| -rw-r--r-- | Completion/Unix/Command/_wget | 20 | ||||
| -rw-r--r-- | Completion/Unix/Command/_xmlsoft | 16 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_fc | 32 |
6 files changed, 88 insertions, 65 deletions
diff --git a/ChangeLog b/ChangeLog index 4bc33e318..04a051add 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-02-21 Oliver Kiddle <opk@zsh.org> + + * 31058: Completion/Zsh/Command/_fc, Completion/Unix/Command/_cut, + Completion/Unix/Command/_sed, Completion/Unix/Command/_wget, + Completion/Unix/Command/_xmlsoft: add options from newer + versions of some commands to completion functions + 2013-02-19 Peter Stephenson <p.w.stephenson@ntlworld.com> * 31055: Completion/compaudit: missing '$' in search of /proc @@ -525,5 +532,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5803 $ +* $Revision: 1.5804 $ ***************************************************** diff --git a/Completion/Unix/Command/_cut b/Completion/Unix/Command/_cut index 81e8c257b..1024c20a7 100644 --- a/Completion/Unix/Command/_cut +++ b/Completion/Unix/Command/_cut @@ -5,54 +5,54 @@ typeset -A _cut_args if _pick_variant gnu="Free Soft" unix --version; then case $LANG in (de_DE.UTF-8) - _cut_args=( - bytes "nur diese Bytes ausgeben" - characters "nur diese Zeichen ausgeben" - delimiter "Delimiter anstelle von Tabulator als Trenner benutzen" - fields "nur diese Felder und alle Zeilen OHNE Trennzeichen ausgeben" - n "(ignoriert)" - complement "das Komplement der Menge der gew$'\u00e4'hlten Bytes, Zeichen oder Felder bilden" - only-delimited "keine Zeilen ausgeben, die keinen Trenner enthalten" - output-delimiter "Zeichenkette als Ausgabetrennzeichen benutzen" - help "diese Hilfe anzeigen und beenden" - version "Versionsinformation anzeigen und beenden" - ) + _cut_args=( + bytes "nur diese Bytes ausgeben" + characters "nur diese Zeichen ausgeben" + delimiter "Delimiter anstelle von Tabulator als Trenner benutzen" + fields "nur diese Felder und alle Zeilen OHNE Trennzeichen ausgeben" + n "(ignoriert)" + complement $'das Komplement der Menge der gew\u00e4hlten Bytes, Zeichen oder Felder bilden' + only-delimited "keine Zeilen ausgeben, die keinen Trenner enthalten" + output-delimiter "Zeichenkette als Ausgabetrennzeichen benutzen" + help "diese Hilfe anzeigen und beenden" + version "Versionsinformation anzeigen und beenden" + ) ;; (*) - _cut_args=( - bytes "select only these bytes" - characters "select only these characters" - delimiter "use DELIM instead of TAB for field delimiter" - fields "select only these fields and lines without the delimiter character" - n "(ignored)" - complement "complement the set of selected bytes, characters or fields" - only-delimited "do not print lines not containing delimiters" - output-delimiter "use STRING as the output delimiter" - help "display this help and exit" - version "output version information and exit" - ) + _cut_args=( + bytes "select only these bytes" + characters "select only these characters" + delimiter "use DELIM instead of TAB for field delimiter" + fields "select only these fields and lines without the delimiter character" + n "(ignored)" + complement "complement the set of selected bytes, characters or fields" + only-delimited "do not print lines not containing delimiters" + output-delimiter "use STRING as the output delimiter" + help "display this help and exit" + version "output version information and exit" + ) ;; esac _arguments \ - '(--bytes -b)'{--bytes=,-b+}'['$_cut_args[bytes]']:list' \ - '(--characters -c)'{--characters=,-c+}'['$_cut_args[characters]']:list' \ - '(--delimiter -d)'{--delimiter=,-d+}'['$_cut_args[delimiter]']:delimeter' \ - '(--fields -f)'{--fields=,-f+}'['$_cut_args[fields]']:list' \ - '-n['$_cut_args[n]']' \ - '--complement['$_cut_args[complement]']' \ - '(--only-delimited -s)'{--only-delimited,-s}'['$_cut_args[only-delimited]']' \ - '--output-delimiter=['$_cut_args[output-delimiter]']:delimeter' \ - '--help['$_cut_args[help]']' \ - '--version['$_cut_args[version]']' \ - '*:file:_files' + '(--bytes -b)'{--bytes=,-b+}'['$_cut_args[bytes]']:list' \ + '(--characters -c)'{--characters=,-c+}'['$_cut_args[characters]']:list' \ + '(--delimiter -d)'{--delimiter=,-d+}'['$_cut_args[delimiter]']:delimiter' \ + '(--fields -f)'{--fields=,-f+}'['$_cut_args[fields]']:list' \ + '-n['$_cut_args[n]']' \ + '--complement['$_cut_args[complement]']' \ + '(--only-delimited -s)'{--only-delimited,-s}'['$_cut_args[only-delimited]']' \ + '--output-delimiter=['$_cut_args[output-delimiter]']:delimiter' \ + '(- *)--help['$_cut_args[help]']' \ + '(- *)--version['$_cut_args[version]']' \ + '*:file:_files' else _arguments \ '-b[list specifies byte positions]:list:' \ '-c[list specifies character positions]:list:' \ - '-d[use alternate delimeter]:delimeter:' \ + '-d[use alternate delimiter]:delimiter' \ '-f[list specifies fields]:list:' \ '-n[do not split multi-byte characters]' \ - '-s[suppress lines with no delimeters]' \ + '-s[suppress lines with no delimiters]' \ '*:file:_files' fi diff --git a/Completion/Unix/Command/_sed b/Completion/Unix/Command/_sed index 99bd5e82a..476575205 100644 --- a/Completion/Unix/Command/_sed +++ b/Completion/Unix/Command/_sed @@ -12,8 +12,10 @@ args=( if _pick_variant gnu=GNU unix --version; then args+=( + '--follow-symlinks[follow symlinks when processing in place]' '(-i --in-place)'{-i-,--in-place=-}'[edit files in place]::suffix for backup' '(-l --line-length)'{-l,--line-length=-}'[specify line-wrap length for the l command]' + '(-r)--posix[disable GNU extensions]' '(-r --regexp-extended)'{-r,--regexp-extended}'[use extended regular expressions]' '(-s --separate)'{-s,--separate}'[consider files separately instead of as a combined stream]' '(-u --unbuffered)'{-u,--unbuffered}'[disable data buffering]' diff --git a/Completion/Unix/Command/_wget b/Completion/Unix/Command/_wget index 51d640d62..f709a0830 100644 --- a/Completion/Unix/Command/_wget +++ b/Completion/Unix/Command/_wget @@ -17,13 +17,14 @@ _arguments -C -s \ '(--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' \ + '--config=[specify config file]:config file:_files' \ '(--tries -t)'{--tries=,-t+}'[set number of retries]:number of retries' \ '--retry-connrefused[retry even if connection is refused]' \ '(--output-document -O)'{--output-document=,-O+}'[specify file to write documents to]:output file:_files' \ '(--continue -c)'{--continue,-c}'[continue getting an existing file]' \ - '--content-disposition[honor the Content-Disposition header when choosing local file names]' \ '--progress=[set progress gauge type]:gauge type:->gauge' \ '(--timestamping -N)'{--timestamping,-N}'[retrieve only files newer than existing]' \ + "--no-use-server-timestamps[don't set the local file's timestamp by the one on the server]" \ '(--server-response -S)'{--server-response,-S}'[print server response]' \ "--spider[don't download anything]" \ '(--timeout -T)'{--timeout=,-T+}'[set all timeout values]:timeout (seconds)' \ @@ -40,11 +41,16 @@ _arguments -C -s \ '--limit-rate=[specify limit to download rate]:download rate limit' \ '--no-dns-cache[disable caching DNS lookups]' \ '--restrict-file-names=[restrict chars in file names to ones OS allows]:OS:->restrict' \ + '--ignore-case[ignore case when matching files/directories]' \ '(-4 --inet4-only -6 --inet6-only)'{-4,--inet4-only}'[connect only to IPv4 addresses]' \ '(-4 --inet4-only -6 --inet6-only)'{-6,--inet6-only}'[connect only to IPv6 addresses]' \ '--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' \ + '--no-iri[turn off IRI support]' \ + '--local-encoding=[specify local encoding for IRIs]:encoding' \ + '--remote-encoding=[specify default remote encoding]:encoding' \ + '--unlink[remove file before clobber]' \ '(--force-directories -x)'{--force-directories,-x}'[force creation of directories]' \ '--protocol-directories[use protocol name in directories]' \ '(--directory-prefix -P)'{--directory-prefix=,-P+}'[specify prefix to save files to]:prefix:_files -/' \ @@ -52,7 +58,8 @@ _arguments -C -s \ '(--user)--http-user=:user' \ '(--password)--http-password=:password' \ '--no-cache[disallow server-cached data]' \ - '(--html-extension -E)'{--html-extension,-E}'[save all HTML documents with a .html extension]' \ + '--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' \ '--proxy-user=:user' \ @@ -61,12 +68,14 @@ _arguments -C -s \ '--save-headers[save http headers]' \ '(--user-agent -U)'{--user-agent=,-U+}'[specify user agent to identify as]:user-agent' \ '--no-http-keep-alive[disable HTTP keep-alive]' \ - '--no-cookies=[turn cookies off]' \ + '--no-cookies[turn cookies off]' \ '--load-cookies=[specify file to load cookies from]:cookie file:_files' \ '--save-cookies=[specify file to save cookies to]:cookie file:_files' \ '--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' \ + '--content-disposition[honor the Content-Disposition header when choosing local file names]' \ + "--auth-no-challenge[send basic HTTP authentication without first waiting for server's challenge]" \ '--secure-protocol=[choose secure protocol]:protocol:(SSLv2 SSLv3 TLSv1)' \ "--no-check-certificate=[don't check the server certificate]" \ '--certificate=[specify client certificate]:client certificate file:_files' \ @@ -89,7 +98,7 @@ _arguments -C -s \ '--delete-after' \ '(--convert-links -k)'{--convert-links,-k}'[convert links to be relative]' \ '(--backup-converted -K)'{--backup-converted,-K}'[backup files before conversion]' \ - '(--mirror -m -r -N -l)'{--mirror,-m}'[mirror (-r -N -l inf -nr)]' \ + '(--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' \ @@ -102,9 +111,10 @@ _arguments -C -s \ '(--span-hosts -H)'{--span-hosts,-H}'[span hosts]' \ '(--relative -L)'{--relative,-L}'[follow relative links only]' \ '(--include-directories -I)'{--include-directories=,-I+}'[include directories]:allowed directories' \ + '--trust-server-names' \ '(--exclude-directories -X)'{--exclude-directories=,-X+}'[exclude directories]:excluded directories' \ + '(-np --no-parent)'{-np,--no-parent}"[don't ascend to parent directory]" \ '--no-host-lookup' \ - '--no-parent' \ '--no-verbose' \ '--no-clobber' \ '--no-directories' \ diff --git a/Completion/Unix/Command/_xmlsoft b/Completion/Unix/Command/_xmlsoft index ed5bfe7f7..67ba6c001 100644 --- a/Completion/Unix/Command/_xmlsoft +++ b/Completion/Unix/Command/_xmlsoft @@ -66,13 +66,14 @@ case $service in '--recover[output what was parsable on broken XML documents]' \ '--huge[remove any internal arbitrary parser limits]' \ '--noent[substitute entity references by their value]' \ + '--noenc[ignore any encoding specified inside the document]' \ "(--output -o)--noout[don't output the result tree]" \ '--path[provide a set of paths for resources]:paths:_files -/' \ '--load-trace[print trace of all external entites loaded]' \ '--nonet[refuse to fetch DTDs or entities over network]' \ + '--nocompact[do not generate compact text nodes]' \ '--htmlout[output results as HTML]' \ '--nowrap[do not put HTML doc wrapper]' \ - '--nocompact[do not generate compact text nodes]' \ '--valid[validate the document in addition to std well-formed check]' \ '(--dtdvalid --relaxng --schema)--postvalid[do a posteriori validation, i.e after parsing]' \ '(--postvalid --relaxng --schema --dtdvalidfpi)--dtdvalid[do a posteriori validation against a given DTD]:DTD:_webbrowser' \ @@ -84,27 +85,28 @@ case $service in '--compress[turn on gzip compression of output]' \ '--html[use the HTML parser]' \ '--xmlout[use the XML serializer when using --html]' \ + '--nodefdtd[do not default HTML doctype]' \ '--push[use the push mode of the parser]' \ '--memory[parse from memory]' \ - '--maxmem[imits memory allocation]:bytes' \ + '--maxmem[limit memory allocation]:bytes' \ '--nowarning[do not emit warnings from parser/validator]' \ '--noblanks[drop (ignorable?) blanks spaces]' \ '--nocdata[replace cdata section with text nodes]' \ '--format[reformat/reindent the input]' \ '--encode[output in the given encoding]:encoding:(${encoding[@]})' \ '--dropdtd[remove the DOCTYPE of the input docs]' \ + "--pretty[pretty-print in a particular style]:style:((0\:don't\ pretty\ print 1\:reformat 2\:add\ whitespace))" \ '--c14n[save in W3C canonical format]' \ '--c14n11[save in W3C canonical format v1.1 (with comments)]' \ '--exc-c14n[save in W3C exclusive canonical format]' \ '--nsclean[remove redundant namespace declarations]' \ - '--testIO[test user I/O support]' \ '(--nocatalogs)--catalogs[use SGML catalogs]' \ '(--catalogs)--nocatalogs[deactivate all catalogs]' \ '--auto[generate a small doc on the fly]' \ '(--noxincludenode)--xinclude[do XInclude processing]' \ '(--xinclude)--noxincludenode[do XInclude processing but do not generate XInclude nodes]' \ - '--loaddtd[fetch external DTD]' \ '--nofixup-base-uris[do not fixup xml:base uris]' \ + '--loaddtd[fetch external DTD]' \ '--dtdattr[loaddtd + populate the tree with inherited attributes]' \ '--stream[use the streaming interface to process very large files]' \ '--walker[create a reader and walk though the resulting doc]' \ @@ -116,7 +118,7 @@ case $service in '--sax1[use the old SAX1 interfaces for processing]' \ '--sax[do not build a tree but work just at the SAX level]' \ '--oldxml10[use XML-1.0 parsing rules before the 5th edition]' \ - '--xpath[evaluate the XPath expression, inply --noout]:XPath expression:' \ + '(--noout)--xpath[evaluate the XPath expression, implies --noout]:XPath expression' \ '*:XML file:_webbrowser' && return ;; *XML_CATALOG_FILES*) @@ -125,7 +127,7 @@ case $service in _urls return fi - + compset -S ':*' _alternative \ 'files:catalog file:_files' \ @@ -134,5 +136,3 @@ case $service in esac return 1 - - diff --git a/Completion/Zsh/Command/_fc b/Completion/Zsh/Command/_fc index bcbb4928e..2af5980c2 100644 --- a/Completion/Zsh/Command/_fc +++ b/Completion/Zsh/Command/_fc @@ -3,17 +3,21 @@ local fc_common fc_hist fc_r fc_common=( - '(-A -R -W -I)-r[reverse order of the commands]' - '(-A -R -W -I -e)-n[suppress line numbers]' - '(-A -R -W -I)*::commands:_command_names -e' ) + '(-A -R -W -I -p -P)-r[reverse order of the commands]' + '(-A -R -W -I -e -p -P)-n[suppress line numbers]' + '(-A -R -W -I -p -P)*::commands:_command_names -e' ) fc_hist=( - '(-A -R -W -I)-m[treat first argument as a pattern]' - '(-A -R -W -I -e -f -E -i)-d[print time-stamps]' - '(-A -R -W -I -e -d -E -i)-f[mm/dd/yyyy format time-stamps]' - '(-A -R -W -I -e -d -f -i)-E[dd.mm.yyyy format time-stamps]' - '(-A -R -W -I -e -d -f -E)-i[yyyy-mm-dd format time-stamps]' - '(-A -R -W -I -e)-D[print elapsed times]' ) + '(-A -R -W -I -p -p)-m[treat first argument as a pattern]' + '(-A -R -W -I -e -f -E -i -t -p -P)-d[print time-stamps]' + '(-A -R -W -I -e -d -E -i -t -p -P)-f[mm/dd/yyyy format time-stamps]' + '(-A -R -W -I -e -d -f -i -t -p -P)-E[dd.mm.yyyy format time-stamps]' + '(-A -R -W -I -e -d -f -E -t -p -P)-i[yyyy-mm-dd format time-stamps]' + '(-A -R -W -I -e -d -f -E -i -p -P)-t[print time-stamps in specified format]:date format' + '(-A -R -W -I -e -p -P)-D[print elapsed times]' + '(- *)-p[push current history to stack]:history file:_files:history size: :saved history size' + '(- *)-P[pop history from stack]' +) fc_r='(-A -R -W -I -e)-l[list resulting commands on stdout]' @@ -26,11 +30,11 @@ case $service in ;; *) _arguments -s -S \ - '(-A -R -W -I -l -n -d -f -E -i -D)-e[specify editor to invoke]:editor to invoke:_command_names -e' \ - '(-l -m -e -r -n -d -f -E -i -D -A -W *)-R[read history from file]:history file:_files' \ - '(-l -m -e -r -n -d -f -E -i -D -R -W *)-A[append history to file]:history file:_files' \ - '(-l -m -e -r -n -d -f -E -i -D -R -A *)-W[write history to file]:history file:_files' \ - '(-l -m -e -r -n -d -f -E -i -D -A -W *)-I[read/write new events only]:history file:_files' \ + '(-A -R -W -I -l -n -d -f -E -i -D -p -P)-e[specify editor to invoke]:editor to invoke:_command_names -e' \ + '(-l -m -e -r -n -d -f -E -i -D -A -W -p -P *)-R[read history from file]:history file:_files' \ + '(-l -m -e -r -n -d -f -E -i -D -R -W -p -P *)-A[append history to file]:history file:_files' \ + '(-l -m -e -r -n -d -f -E -i -D -R -A -p -P *)-W[write history to file]:history file:_files' \ + '(-l -m -e -r -n -d -f -E -i -D -A -W -p -P *)-I[read/write new events only]:history file:_files' \ "$fc_common[@]" "$fc_hist[@]" "$fc_r" && return 0 ;; esac |