From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH 1/3] _man: Drop (b): it's incorrect when $sect contains '|'.
Date: Thu, 4 Aug 2016 15:54:23 +0000 [thread overview]
Message-ID: <1470326066-3241-2-git-send-email-danielsh@tarsus.local2> (raw)
In-Reply-To: <1470326066-3241-1-git-send-email-danielsh@tarsus.local2>
---
Completion/Unix/Command/_man | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Completion/Unix/Command/_man b/Completion/Unix/Command/_man
index e892bb2..ef17ad8 100644
--- a/Completion/Unix/Command/_man
+++ b/Completion/Unix/Command/_man
@@ -37,7 +37,10 @@ _man() {
mrd=(${^_manpath/\%L/${LANG:-En_US.ASCII}}/mandb(N))
- # $sect is from the command line, the "3p" in "man 3p memcpy"
+ # $sect is from the command line, the "3p" in "man 3p memcpy".
+ # It may also be a |-joined (and later in the code "()"-enclosed) list of
+ # section names.
+ # TODO: disentangle this to always be an array.
# $sect_dirname is from the filesystem, the "3" in "/usr/share/man/man3"
# These are used by _man_pages
local sect sect_dirname
@@ -117,7 +120,7 @@ _man_pages() {
fi
pages=( ${(M)dirs:#*$sect_dirname/} )
- compfiles -p pages '' '' "$matcher" '' dummy "*${(b)sect}*"
+ compfiles -p pages '' '' "$matcher" '' dummy "*${sect}*"
pages=( ${^~pages}(N:t) )
(($#mrd)) && pages[$#pages+1]=($(awk $awk $mrd))
next prev parent reply other threads:[~2016-08-04 15:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-04 15:54 [PATCH 0/3] A set of _man fixes — explanation for 3(a)/3 and 3(b)/3 Daniel Shahaf
2016-08-04 15:54 ` Daniel Shahaf [this message]
2016-08-04 15:54 ` [PATCH 2/3] _man: Fix two bugs when completing manpage filenames in separate-sections mode Daniel Shahaf
2016-08-04 15:54 ` [PATCH 3(a)/3] _man: Support _correct_word Daniel Shahaf
2016-08-04 15:54 ` [PATCH 3(b)/3] " Daniel Shahaf
2016-08-04 16:08 ` Peter Stephenson
2016-08-04 16:28 ` Bart Schaefer
2016-08-04 19:54 ` Bart Schaefer
2016-08-04 21:47 ` Daniel Shahaf
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=1470326066-3241-2-git-send-email-danielsh@tarsus.local2 \
--to=d.s@daniel.shahaf.name \
--cc=zsh-workers@zsh.org \
/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).