From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH 3(b)/3] _man: Support _correct_word.
Date: Thu, 4 Aug 2016 15:54:26 +0000 [thread overview]
Message-ID: <1470326066-3241-5-git-send-email-danielsh@tarsus.local2> (raw)
In-Reply-To: <1470326066-3241-1-git-send-email-danielsh@tarsus.local2>
Since compfiles is undocumented, avoid its use altogether, replacing it by
a construct that blackbox analysis suggests to be equivalent.
The compfiles call being removed effected the following change (when
completing «man -S 8:1 getc<TAB>»):
BEFORE THE CALL:
typeset -a pages=( /home/daniel/prefix/zsh/share/man/man1/
/usr/share/man/man8/
/usr/share/man/man1/ )
AFTER THE CALL:
typeset -a pages=( '/home/daniel/prefix/zsh/share/man/man1/getc*(8|1)*'
'/usr/share/man/man8/getc*(8|1)*'
'/usr/share/man/man1/getc*(8|1)*' )
This patch effects the same transformation (modulo doubling the final slash).
Any -M parameter will be passed to compadd.
---
Completion/Unix/Command/_man | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/Completion/Unix/Command/_man b/Completion/Unix/Command/_man
index ffe53be..ae6ac38 100644
--- a/Completion/Unix/Command/_man
+++ b/Completion/Unix/Command/_man
@@ -103,7 +103,7 @@ _man() {
}
_man_pages() {
- local matcher pages dummy sopt
+ local pages sopt
# What files corresponding to manual pages can end in.
local suf='.((?|<->*)(|.gz|.bz2|.Z|.lzma))'
@@ -121,17 +121,8 @@ _man_pages() {
return $?
fi
- zparseopts -E M+:=matcher
-
- if (( $#matcher )); then
- matcher=( ${matcher:#-M} )
- matcher="$matcher"
- else
- matcher=
- fi
-
pages=( ${(M)dirs:#*$sect_dirname/} )
- compfiles -p pages '' '' "$matcher" '' dummy "*${sect}*"
+ pages=( ${^pages}/"*$sect${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 ` [PATCH 1/3] _man: Drop (b): it's incorrect when $sect contains '|' Daniel Shahaf
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 ` Daniel Shahaf [this message]
2016-08-04 16:08 ` [PATCH 3(b)/3] " 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-5-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).