diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_ls | 22 | ||||
| -rw-r--r-- | Completion/X/Command/_mozilla | 72 |
3 files changed, 59 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog index 1811d97a5..d313617dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-11-21 Oliver Kiddle <opk@zsh.org> + * 19265: Completion/Unix/Command/_ls, Completion/X/Command/_mozilla: + update for latest versions + * unposted: Completion/Unix/Command/_screen: tidy up descriptions * Stephen Rüger: 19255: Completion/Debian/Command/_apt: update diff --git a/Completion/Unix/Command/_ls b/Completion/Unix/Command/_ls index e1a9222b3..29af5c875 100644 --- a/Completion/Unix/Command/_ls +++ b/Completion/Unix/Command/_ls @@ -6,10 +6,13 @@ local arguments arguments=( '(--all -a -A --almost-all)'{--all,-a}'[list entries starting with .]' '(--almost-all -A -a --all)'{--almost-all,-A}'[list all except . and ..]' + '--author[print the author of each file]' '(--ignore-backups -B)'{--ignore-backups,-B}"[don't list entries ending with ~]" '(--directory -d)'{--directory,-d}'[list directory entries instead of contents]' + '(--dired -D)'{--dired,-D}"[generate output designed for Emacs' dired mode]" '(--ignore,-I)'{--ignore,-I}"[don't list entire matching pattern]:pattern:" - '(--dereference -L)'{--dereference,-L}'[list referenced file for sym link]' + '(--dereference -L --dereference-command-line --dereference-command-line-symlink-to-dir)'{--dereference,-L}'[list referenced file for sym link]' + '(--dereference -L --dereference-command-line --dereference-command-line-symlink-to-dir)'{--dereference-command-line,--dereference-command-line-symlink-to-dir} '(--recursive -R)'{--recursive,-R}'[list subdirectories recursively]' '(--no-group -G)'{--no-group,-G}'[inhibit display of group information]' @@ -17,19 +20,21 @@ arguments=( '(--si -H -h --human-readable)'{--si,-H}'[sizes in human readable form; powers of 1000]' '(--inode -i)'{--inode,-i}'[print file inode numbers]' - '(--format -o -1 -C -m -x)-l[long listing]' + '(--format -l -g -o -1 -C -m -x)-l[long listing]' + '(--format -l -1 -C -m -x)-g[long listing but without owner information]' '(--format -l --no-group -G -1 -C -m -x)-o[no group, long]' - '(--format -l -o -C -m -x)-1[single column output]' - '(--format -l -o -1 -m -x)-C[sort vertically]' - '(--format -l -o -1 -C -x)-m[comma separated]' - '(--format -l -o -1 -C -m)-x[sort horizontally]' - '(-l -o -1 -C -m -x)--format=:format:(verbose long commas horizontal across vertical single-column)' + '(--format -l -g -o -C -m -x)-1[single column output]' + '(--format -l -g -o -1 -m -x)-C[list entries in columns sorted vertically]' + '(--format -l -g -o -1 -C -x)-m[comma separated]' + '(--format -l -g -o -1 -C -m)-x[sort horizontally]' + '(-l -g -o -1 -C -m -x)--format=:format:(verbose long commas horizontal across vertical single-column)' '(--size -s -f)'{--size,-s}'[display size of each file in blocks]' '(--time -u)-c[status change time]' '(--time -c)-u[access time]' '(-c -u)--time=[specify time to show]:time:(ctime status use atime access)' + '--time-style=[show times using specified style]:time style:(full-iso long-iso iso locale)' '(-a --all -U -l --format -s --size -t --sort --full-time)-f[unsorted, all, short list]' '(--reverse)'{--reverse,-r}'[reverse sort order]' @@ -63,7 +68,8 @@ arguments=( '(--hide-control-chars -q --show-control-chars)'{--hide-control-chars,-q}'[hide control chars]' '(-q --hide-control-chars)--show-control-chars' - '--version[display version information]' + '(- :)--help[display help information]' + '(- :)--version[display version information]' '*:files:_files' ) diff --git a/Completion/X/Command/_mozilla b/Completion/X/Command/_mozilla index 4f129476f..f8f12c730 100644 --- a/Completion/X/Command/_mozilla +++ b/Completion/X/Command/_mozilla @@ -1,35 +1,39 @@ -#compdef mozilla +#compdef mozilla mozilla-firebird mozilla-xremote-client local curcontext="$curcontext" state line ret=1 suf typeset -A opt_args -_x_arguments -C \ - '-height[height of startup window]:height:' \ - '(-h)-help[show usage message]' \ - '(-help)-h[show usage message]' \ - '-installer[start with 4.x migration window]' \ - '-width[width of startup window]:width:' \ - '(-v)-version[show the version number and build date]' \ - '(-version)-v[show the version number and build date]' \ - '-CreateProfile:profile:' \ - '-P[start with profile]:profile:' \ - '-ProfileWizard[start with profile wizard]' \ - '-ProfileManager[start with profile manager]' \ - '-SelectProfile[start with profile selection dialog]' \ - '-UILocale:locale:' \ - '-contentLocale:locale:' \ - '-remote[execute a command in an existing Mozilla]:remote command:->remote' \ - '-splash[enable splash screen]' \ - '-chat[start with IRC client]' \ - '-news[start with news]' \ - '-jsconsole[start with JavaScript Console]' \ - '-venkman[start with JavaScript debugger]' \ - '-terminal[start with command line terminal]' \ - '-edit[start with editor]:url:_urls' \ - '-chrome[load the specified chrome]:url:_urls' \ - '-mail[start with mail]' \ - '-compose[start with messenger compose]:url:_urls' \ - '*:location:->urls' && ret=0 +local popts="-installer -CreateProfile -P -ProfileWizard -ProfileManager -SelectProfile" + +if [[ $service = *remote* ]]; then + state=remote +else + _x_arguments -C \ + '-height[height of startup window]:height' \ + '(-)'{-h,-help}'[show usage message]' \ + "($popts)-installer[start with 4.x migration window]" \ + '-width[width of startup window]:width' \ + '(-)'{-v,-version}'[show the version number and build date]' \ + "($popts)-CreateProfile:profile" \ + "($popts)-P[start with profile]:profile:compadd ~/.mozilla/*/*.slt(\:h\:t)" \ + "($popts)-ProfileWizard[start with profile wizard]" \ + "($popts)-ProfileManager[start with profile manager]" \ + "($popts)-SelectProfile[start with profile selection dialog]" \ + '-UILocale:locale' \ + '-contentLocale:locale' \ + '-remote[execute a command in an existing Mozilla]:remote command:->remote' \ + '-splash[enable splash screen]' \ + '-chat[start with IRC client]' \ + '-news[start with news]' \ + '-jsconsole[start with JavaScript Console]' \ + '-venkman[start with JavaScript debugger]' \ + '-terminal[start with command line terminal]' \ + '-edit[start with editor]:url:_urls' \ + '-chrome[load the specified chrome]:url:_urls' \ + '-mail[start with mail]' \ + '-compose[start with messenger compose]:url:_urls' \ + '*:location:->urls' && ret=0 +fi [[ "$state" = "urls" ]] && _files "$@" && return 0 @@ -37,7 +41,7 @@ _x_arguments -C \ # Handle mozilla remote commands if [[ "$state" = "remote" ]]; then local -a remote_commands - remote_commands=(openURL openFile saveAs mailto addBookmark) + remote_commands=(openURL openFile saveAs mailto addBookmark ping) compset -P '*\(' if compset -S '(|\\)\)*'; then @@ -46,7 +50,15 @@ if [[ "$state" = "remote" ]]; then set - -S"${${QIPREFIX:+)}:-\)}$compstate[quote] " "$@" fi case $IPREFIX in - openURL*|addBookmark*) state=urls;; + openURL*) + if compset -P "*,"; then + _wanted option expl 'option' compadd "$@" new-tab new-window && ret=0 + else + compset -S ',*' + state=urls + fi + ;; + addBookmark*) state=urls;; openFile*) _files "$@" -W ~;; saveAs*) if compset -P "*,"; then |