mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

users/10282: complete associated sections with man page names.

Browse Source
This commit is contained in:
Clint Adams 2006-06-09 19:55:48 +00:00
parent efd5cec449
commit ef570806aa
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

19
Completion/Unix/Command/_man
View File

@ -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 "$@"