From: Clint Adams <clint@zsh.org>
To: zsh-workers@sunsite.dk
Subject: PATCH: _man and manpath
Date: Fri, 31 May 2002 00:59:37 -0400 [thread overview]
Message-ID: <20020531045937.GA9093@dman.com> (raw)
If $MANPATH is set and different from $(manpath), _man will never get
the output of of manpath since $manpath is tied to $MANPATH.
With this patch, it will.
Index: Completion/Unix/Command/_man
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_man,v
retrieving revision 1.5
diff -u -r1.5 _man
--- Completion/Unix/Command/_man 10 Jan 2002 11:00:05 -0000 1.5
+++ Completion/Unix/Command/_man 31 May 2002 04:55:32 -0000
@@ -7,20 +7,24 @@
_files || return 0
fi
- if (( ! $#manpath )); then
+ if (( ! $#_manpath )); then
local mp
- mp=($(manpath 2>/dev/null))
+ mp=( ${(s.:.)$(manpath 2>/dev/null)} )
[[ "$mp" == *:* ]] && mp=( ${(s.:.)mp} )
- manpath=( $mp )
+ if (( $#mp )); then
+ _manpath=( $mp )
+ elif (( $#manpath )); then
+ _manpath=( $manpath )
+ fi
fi
- (( $#manpath )) || manpath=( ${(s.:.)$(manpath 2>/dev/null)} ) ||
- manpath=( /usr/man(-/) /(opt|usr)/(dt|share|X11R6|local)/(cat|)man(-/) )
+ (( $#_manpath )) ||
+ _manpath=( /usr/man(-/) /(opt|usr)/(dt|share|X11R6|local)/(cat|)man(-/) )
# `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))
+ mrd=(${^_manpath/\%L/${LANG:-En_US.ASCII}}/mandb(N))
local sect
if [[ $OSTYPE = solaris* ]]; then
@@ -34,10 +38,10 @@
fi
if [[ $sect = (<->*|1M|l|n) || $sect = \(*\|*\) ]]; then
- dirs=( $^manpath/(sman|man|cat)${~sect}/ )
+ dirs=( $^_manpath/(sman|man|cat)${~sect}/ )
awk="\$2 == \"$sect\" {print \$1}"
else
- dirs=( $^manpath/(sman|man|cat)*/ )
+ dirs=( $^_manpath/(sman|man|cat)*/ )
awk='{print $1}'
fi
if zstyle -t ":completion:${curcontext}:manuals" separate-sections; then
next reply other threads:[~2002-05-31 4:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-05-31 4:59 Clint Adams [this message]
2002-05-31 5:18 ` Bart Schaefer
2002-05-31 5:24 ` Clint Adams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020531045937.GA9093@dman.com \
--to=clint@zsh.org \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).