Re: _man igores global matchers

["Bart Schaefer" <schaefer@candle.brasslantern.com>]

[-- Attachment #1: Type: text/plain, Size: 936 bytes --]

I wrote:
}
} This patch drops the filtering on man page name and instead slurps up all
} the file basenames into the `rep' array, then passes that and the global
} matcher spec to compadd to let it sort out the mess.  If you have several
} matchers this can get pretty slow, so it ought at least to cache `rep'
} somewhere during the loop over the matchers; as it stands this is mostly
} a proof of concept.

Here's a better variation, which actually does cache the results for one
pass around the matcher loop.  It's quite a bit faster than with the
patch from 14621, but still slower than the existing _man.

The diff is bigger than the file, because of re-indentation, so I've just
attached the entire file.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net   

[-- Attachment #2: Text --]
[-- Type: text/plain , Size: 1291 bytes --]

#compdef man apropos whatis

local rep expl mrd

if [[ $service == man ]] && (( $words[(I)-l] + $words[(I)--local-file] )); then
  _files || return 0
fi

if (( ! $#manpath )); then
  local mp
  mp=($(manpath 2>/dev/null))
  [[ "$mp" == *:* ]] && mp=( ${(s.:.)mp} )
  manpath=( $mp )

  (( $#manpath )) || manpath=( ${(s.:.)$(manpath 2>/dev/null)} ) ||
    manpath=( /usr/man(-/) /(opt|usr)/(dt|share|X11R6|local)/(cat|)man(-/) )
fi

if (( _matcher_num < 2 )); then

  # `sman' is the SGML manual directory for Solaris 7.
  # 1M is system administrator commands on SVR4

  mrd=(${^manpath/\%L/${LANG:-En_US.ASCII}}/mandb(N))
  if [[ $words[2] = (<->*|1M|l|n) ]]; then
    rep=(
    $manpath/(sman|man|cat)${words[2]}/*.*(:t) )
    (($#mrd)) && rep[$#rep+1]=($(awk "\$2 == \"$words[2]\" {print \$1}" $mrd))
  else
    rep=( $manpath/(sman|man|cat)*/*.*(:t) )
    (($#mrd)) && rep[$#rep+1]=($(awk '{print $1}' $mrd))
  fi

  # Remove any compression suffix, then remove the minimum possible string
  # beginning with .<->: that handles problem cases like files called
  # `POSIX.1.5'.
  rep=(${${rep%%.(bz2|z|gz|Z)}%.<->*})

  mrd=( ${(q)rep} )
  eval "_man_cached() { rep=( $mrd ) }"

else

  _man_cached

fi

(( $#rep )) && 
  _wanted manuals expl 'manual page' compadd -M "$_matcher" -a rep