diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Unix/Command/.distfiles | 1 | ||||
| -rw-r--r-- | Completion/Unix/Command/_loadkeys | 17 | ||||
| -rw-r--r-- | Completion/Unix/Command/_lp | 2 | ||||
| -rw-r--r-- | Completion/Unix/Command/_pbm | 2 | ||||
| -rw-r--r-- | Completion/Unix/Command/_w3m | 12 |
6 files changed, 24 insertions, 17 deletions
@@ -1,3 +1,10 @@ +2001-05-03 Oliver Kiddle <opk@zsh.org> + + * 14216: Completion/Unix/Command/.distfiles, + Completion/Unix/Command/_loadkeys, Completion/Unix/Command/_lp, + Completion/Unix/Command/_pbm, Completion/Unix/Command/_w3m: minor + completion changes + 2001-05-03 Sven Wischnowsky <wischnow@zsh.org> * 14214: Src/Zle/computil.c: ignore errors when removing quotes diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles index 6d04555ea..1ce9843b8 100644 --- a/Completion/Unix/Command/.distfiles +++ b/Completion/Unix/Command/.distfiles @@ -14,4 +14,5 @@ _cvs _gnu_generic _ls _perl _tar _zip _dd _gprof _lynx _perldoc _telnet _pine _dict _grep _lzop _prcs _tiff _elm _diff _gs _make _psutils _tin _apm _mail +_loadkeys ' diff --git a/Completion/Unix/Command/_loadkeys b/Completion/Unix/Command/_loadkeys index 51e78d0c5..9244392fc 100644 --- a/Completion/Unix/Command/_loadkeys +++ b/Completion/Unix/Command/_loadkeys @@ -1,9 +1,8 @@ #compdef loadkeys -if [[ $OSTYPE == linux* ]] -then - -_arguments \ +case $OSTYPE in + linux*) + _arguments \ '(--clearcompose)-c[clearcompose]' \ '(-c)--clearcompose' \ '(--default)-d[default]' \ @@ -17,10 +16,10 @@ _arguments \ '(--verbose)-v[verbose]' \ '(-v)--verbose' \ ':keymap:_files -W /usr/share/keymaps' - -elif [[ $OSTYPE == solaris* ]] -then - + ;; + solaris*) _files -W /usr/share/lib/keytables + ;; -fi + *) _default;; +esac diff --git a/Completion/Unix/Command/_lp b/Completion/Unix/Command/_lp index 49f9b6cf6..d21f970f7 100644 --- a/Completion/Unix/Command/_lp +++ b/Completion/Unix/Command/_lp @@ -2,7 +2,7 @@ local expl ret=1 printer list disp strs shown -if compset -P -P || [[ "$words[CURRENT-1]" = -P ]]; then +if compset -P -[dP] || [[ "$words[CURRENT-1]" = -[dP] ]]; then _printers else if [[ "$service" = (lpq|lprm) ]]; then diff --git a/Completion/Unix/Command/_pbm b/Completion/Unix/Command/_pbm index 7980fc2b7..0255905f6 100644 --- a/Completion/Unix/Command/_pbm +++ b/Completion/Unix/Command/_pbm @@ -398,7 +398,7 @@ pnmpad) '-l-[specify left border width]:left border width:' \ '-r-[specify right border width]:right border width:' \ '-t-[specify top border width]:top border width:' \ - '-b-[specify bottom border width]:bottom border width:' \ + '-b-[specify bottom border width]:bottom border width:_guard "[0-9]#"' \ ':file: _pbm' ;; diff --git a/Completion/Unix/Command/_w3m b/Completion/Unix/Command/_w3m index f693a1e7c..a2a0d0b32 100644 --- a/Completion/Unix/Command/_w3m +++ b/Completion/Unix/Command/_w3m @@ -14,22 +14,22 @@ _arguments \ '-v[visual startup mode]' \ '-M[monochrome display]' \ '-F[automatically render frame]' \ - '-dump' \ + '(-dump_source -dump_head)-dump' \ '-cols:column width:' \ - '-dump_source' \ - '-dump_head' \ + '(-dump -dump_head)-dump_source' \ + '(-dump -dump_source)-dump_head' \ '+:goto line:' \ '-num[show line number]' \ '-no-proxy' \ '-no-mouse' \ - '-cookie' \ - '-no-cookie' \ + '(-no-cookie)-cookie' \ + '(-cookie)-no-cookie' \ '-no-graph' \ '-S[squeeze multiple blank lines]' \ '-W[toggle wrap search mode]' \ '-X[do not use termcap init/deinit]' \ '-o[option]:option-value:' \ - '-config:configfile:_files' \ + '-config:config file:_files' \ '-debug' \ ':url:->url' && return 0 |