diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_man | 19 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index c02741c38..c4f6ea701 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-09 Clint Adams <clint@zsh.org> + + * users/10282: Oliver Kiddle: Completion/Unix/Command/_man: + complete associated sections with man page names. + 2006-06-08 Clint Adams <clint@zsh.org> * unposted: Completion/Debian/Command/_madison: complete the diff --git a/Completion/Unix/Command/_man b/Completion/Unix/Command/_man index a75c1281c..8f28d34eb 100644 --- a/Completion/Unix/Command/_man +++ b/Completion/Unix/Command/_man @@ -28,7 +28,7 @@ _man() { local sect if [[ $OSTYPE = solaris* ]]; then - sect=$words[$words[(i)-s]+1] + sect=${${words[(R)-s*]#-s}:-$words[$words[(i)-s]+1]} elif [[ -n ${sect:=$words[$words[(i)-S]+1]} || -n ${sect:=$MANSECT} ]]; then if [[ $sect != ${sect::="${sect//:/|}"} ]]; then sect="($sect)" @@ -44,7 +44,11 @@ _man() { dirs=( $^_manpath/(sman|man|cat)*/ ) awk='{print $1}' fi - if zstyle -t ":completion:${curcontext}:manuals" separate-sections; then + if [[ $OSTYPE = solaris* && ( $words[CURRENT] = -s* || $words[CURRENT-1] == -s ) ]]; then + [[ $words[CURRENT] = -s* ]] && compset -P '-s' + sects=( ${(o)${dirs##*(man|cat)}%/} ) + _wanted sections expl 'section' compadd -a sects + elif zstyle -t ":completion:${curcontext}:manuals" separate-sections; then typeset -U sects local ret=1 @@ -69,7 +73,7 @@ _man() { } _man_pages() { - local matcher pages dummy + local matcher pages dummy sopt zparseopts -E M+:=matcher @@ -90,7 +94,14 @@ _man_pages() { # beginning with .<->: that handles problem cases like files called # `POSIX.1.5'. - compadd "$@" - ${pages%.(?|<->*(|.gz|.bz2|.Z))} + [[ $OSTYPE = solaris* ]] && sopt='-s ' + if ((CURRENT > 2)) || + ! zstyle -t ":completion:${curcontext}:manuals.$sect" insert-sections + then + compadd "$@" - ${pages%.(?|<->*(|.gz|.bz2|.Z))} + else + compadd "$@" -P "$sopt$sect " - ${pages%.(?|<->*(|.gz|.bz2|.Z))} + fi } _man "$@" |