From mboxrd@z Thu Jan 1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level:
X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,
T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=ham
autolearn_force=no version=3.4.4
Received: (qmail 32167 invoked from network); 17 Mar 2022 16:30:53 -0000
Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368)
by inbox.vuxu.org with ESMTPUTF8; 17 Mar 2022 16:30:53 -0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1647534653;
b=F1wIibzqAGr6kwQWsZo8mfsz4kBSHcYcdEKC5zcAVAxjgbCBFz/8yiyCJVhbX2xwIeobCxa8be
Dhhenm4mzKdQY79LDjfgkzz0iesFPhZ4iKYz1mUD6WvVMfLUyjdQ1QmKqQquJZuJLnrOs8RzOp
i8RfW6HS3GbSe5bvm1f+buBCRt7bYSPx49EXi4ua3/bcudK8RA8eLL0+g2w1C8Bpo0IEZ68gSY
QAVFip1pb6HN5a/YE1dLm9O3tPAstRmSQ9+5R7luVgKN1hvw70hOZOOrK17JrHJe9Vr5tpGOPq
5RG28KUgC53sfz2E6jQat1yI+wB7IgkYu1WEbmUtUqXOSw==;
ARC-Authentication-Results: i=1; zsh.org;
iprev=pass (smtpq1.tb.ukmail.iss.as9143.net) smtp.remote-ip=212.54.57.96;
dkim=pass header.d=ntlworld.com header.s=meg.feb2017 header.a=rsa-sha256;
dmarc=pass header.from=ntlworld.com;
arc=none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1647534653;
bh=BD74G5GtC6sQxOF32UyWjESq9aSgSpPtuqbcKc6IH1s=;
h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help:
List-Id:Sender:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:
References:In-Reply-To:Message-ID:To:From:Date:DKIM-Signature:
DKIM-Signature;
b=pAyqueG6Me+8lJx2NyBc2X/kyS0ftxG4O5qvWPiEXZ24Nmc/MP0VROsLXkK2+V3LscDjtBPGMP
093xhL+3rqXEJfkwvB7C2/In8Fty/ldtBi/W+8orGDASLus1A+u+vlptQL9joyYwsrWyPMuLAH
DWhB0LuNYhV/ax/RGiOxAhEEuHQZKXaz/8GimU/EouHr3kr6e8djQOSZoK9AC/FLNhwDgSMrf4
cFVvoHmkIffyqN89gWvNxmzs+KC6pHS3vFjOTxbH6HVu1pAO7Ws0yAfQVOGPUsCSix25crR1Iy
CTaHfqK8oirI2/jrEqIOMIZ1eDXjs9kU3SncGaYhkzwVBw==;
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org;
s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:
List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding:
Content-Type:MIME-Version:Subject:References:In-Reply-To:Message-ID:To:From:
Date:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From:
Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID;
bh=GzuojN+xE+cIs8loqgLh6rd4eEtuc5S42Y2f2a8o1u8=; b=D1eOR4YgQBOWepah21d8bqAWVK
59urP6s7TFWBkeVo8aM2q5z7gaQ5BGy2gS8Du3FpkMWM1Ai4MuipBFVlgI4FBTsCk5RiZGLGNiDVi
1Bp2t83pITJ9h81riDAFBe9xRVOPWsGmD/P0AUMxaVt9zBMHicwgTcVkoEpIwKVP2TIX+wVvJ8V7J
yqPVx1BD03OYI4p0yud1VTeby2+u+ssdfOo7sfalTXjbzp+nvM/dzFKOqRC1HCCMwlAlFHaFesLVt
gw9OyWjUzy7AhjpTqGa4rfeZja8KoatPbmIs/jHft3W4r+T8O9u/9wOc8XZlya08tLN/VDleKV46y
96Dli7ew==;
Received: from authenticated user by zero.zsh.org with local
id 1nUt1X-000MwM-Ra; Thu, 17 Mar 2022 16:30:51 +0000
Authentication-Results: zsh.org;
iprev=pass (smtpq1.tb.ukmail.iss.as9143.net) smtp.remote-ip=212.54.57.96;
dkim=pass header.d=ntlworld.com header.s=meg.feb2017 header.a=rsa-sha256;
dmarc=pass header.from=ntlworld.com;
arc=none
Received: from smtpq1.tb.ukmail.iss.as9143.net ([212.54.57.96]:37644)
by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256)
id 1nUt07-000MZE-GE; Thu, 17 Mar 2022 16:29:24 +0000
Received: from [212.54.57.80] (helo=smtp1.tb.ukmail.iss.as9143.net)
by smtpq1.tb.ukmail.iss.as9143.net with esmtp (Exim 4.90_1)
(envelope-from
)
id 1nUt06-0006mr-T5
for zsh-workers@zsh.org; Thu, 17 Mar 2022 17:29:22 +0100
Received: from oxbe25.tb.ukmail.iss.as9143.net ([172.25.160.156])
by smtp1.tb.ukmail.iss.as9143.net with ESMTP
id Ut06nwYXaBAYNUt06n4nee; Thu, 17 Mar 2022 17:29:22 +0100
X-Env-Mailfrom: p.w.stephenson@ntlworld.com
X-Env-Rcptto: zsh-workers@zsh.org
X-SourceIP: 172.25.160.156
X-CNFS-Analysis: v=2.4 cv=IZSU5Ema c=1 sm=1 tr=0 ts=623361e2 cx=a_exe
a=NA7IgXeTfPXpJV+SL5V8Rw==:117 a=wbvTLvLwOfMA:10 a=IkcTkHD0fZMA:10
a=7H6ixmLU1AQA:10 a=NLZqzBF-AAAA:8 a=ecXF7qu04efxbAnDiWgA:9 a=QEXdDO2ut3YA:10
a=wW_WBVUImv98JQXhvVPZ:22
X-Authenticated-Sender: p.w.stephenson@ntlworld.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ntlworld.com;
s=meg.feb2017; t=1647534562;
bh=BD74G5GtC6sQxOF32UyWjESq9aSgSpPtuqbcKc6IH1s=;
h=Date:From:To:In-Reply-To:References:Subject;
b=k6ecZdlMPjTvVUjZBFU7QKAOnDdfqpuW+hDUuQF7rgH/2exqBoGRypI4sko9WJEVV
FWO0b/BP7fZ07xek5isBCVe8LfqnhhJUHGLy6Jsur8qx6MA7uimNxvgrcD+oq3+LRB
9rAebUc/yL7ysUGyzreZuOlmrpn/fJQ4dUPSfxk7dZ0RDH4DhMvLV7tCLuck62fJrc
5FWsv2l/tEMlAHmGIQneBa7FY594NM3VZ9OxchZs13JDqjv6SnhNagG9Z8b0g/FRBe
wAe4NteA5DGgsvC/KOP1+aOJCRHNAWagYF34+VO8wCq7Mc/k+ynIaigl9cjUYG67Qc
3LLZyAHRMQYVg==
Date: Thu, 17 Mar 2022 16:29:22 +0000 (GMT)
From: Peter Stephenson
To: zsh-workers@zsh.org
Message-ID: <274918484.477546.1647534562812@mail2.virginmedia.com>
In-Reply-To: <1A53A198-35F4-44D3-9B85-86A79A0233C9@kba.biglobe.ne.jp>
References: <20220315171305.GB617047@zira.vinc17.org>
<65163150.28923.1647367522118@mail2.virginmedia.com>
<2C495A59-EBA8-4C23-B0BB-964C4F0FEA40@kba.biglobe.ne.jp>
<1515237577.54444.1647443187880@mail2.virginmedia.com>
<1A53A198-35F4-44D3-9B85-86A79A0233C9@kba.biglobe.ne.jp>
Subject: Re: completion for "info -f" does not work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-Priority: 3
Importance: Medium
X-Mailer: Open-Xchange Mailer v7.8.4-Rev72
X-Originating-IP: 147.161.167.85
X-Originating-Client: open-xchange-appsuite
X-CMAE-Envelope: MS4xfBpqjjLPZOqXrsSn1/LHJIBen/BN1sqa1Xd9xIsrARF0O8zt7YPkXKQ2IiW/pp6u6nBDG9F3OxyitNX7bQ0gIwtXGLVI1j7eh2R4R1xK3NUwsmQilG8H
kpvTYLtgSmfWBJ9Mr04GRf+1GvWywNZzjYl4bB0Jljqdh8UpnYquBz2Xsq7uvcYfgO4wr9RSyTxfkekaD7rXRCNxwhD99Ct/pmrCR3UKpllv5wso8YtUZkQH
X-Seq: 49863
Archived-At:
X-Loop: zsh-workers@zsh.org
Errors-To: zsh-workers-owner@zsh.org
Precedence: list
Precedence: bulk
Sender: zsh-workers-request@zsh.org
X-no-archive: yes
List-Id:
List-Help:
List-Subscribe:
List-Unsubscribe:
List-Post:
List-Owner:
List-Archive:
> On 16 March 2022 at 15:28 "Jun. T" wrote:
> > 2022/03/17 0:06, Peter Stephenson wrote:
> >
> >> On 16 March 2022 at 08:46 Jun T wrote:
> >>> 2022/03/16 3:05, Peter Stephenson wrote:
> >>>
> >>> + if [[ $PREFIX = (./|../|/)* ]]; then
> >>> + files=( $^infopath/*.info(|.gz|.bz2)(-.:t:s/.gz//:s/.bz2//:r) )
> >>> + tags=(files)
> >>> + items=()
> >>> + else
> >> (snip)
> >>> + _requested files expl 'file' && _files -g '*.info(|.gz|.bz2)'
>
> I feel just '_files -g "*.info(|.gz|.bz2)"' is enough for 'info -f'.
> But if we want to combine it with files in infopath, we need to set
> tags=(files info-files), am I right?
Yes, something like the following might do it.
I can see info -f is a roundabout way of completing via the info path,
but it does work, so we might as well support it.
pws
diff --git a/Completion/Unix/Command/_texinfo b/Completion/Unix/Command/_texinfo
index 7dfa32e45..39f8cd1b5 100644
--- a/Completion/Unix/Command/_texinfo
+++ b/Completion/Unix/Command/_texinfo
@@ -41,7 +41,7 @@ case $service in
'(: -)'{-k+,--apropos=}'[look up string in indices]:search string: ' \
\*{-d+,--directory=}'[add directory to infopath]:info dir:_files -/' \
'--dribble=[record keystrokes]:file with keystrokes:_files' \
- '(-f --file 1)'{-f+,--file=}'[specify Info manual to visit]:info manual:->infofiles' \
+ '(-f --file 1)'{-f+,--file=}'[specify Info manual to visit]:info manual:->infofiles+' \
'(: - -h --help)'{-h,--help}'[display usage]' \
'(-o --output -O)--index-search=[search for matching index entry]:search string:->index-entries' \
'(--index-search -o --output -O)'{-o+,--output=}'[dump selected nodes to filename]:filename:_files -g "*(-.)"' \
@@ -289,7 +289,11 @@ if [[ -n $state ]]; then
items=( ${${${(M)${(f)"$(_call_program menu-items info -o-)"}:#(#s)\* *: \(*}#??}%%\)*} )
files+=( ${items##*\(} )
tags=( info-files )
- if [[ $state != infofiles ]]; then
+ if [[ $state = infofiles+ ]]; then
+ # local files allowed
+ tags+=(files)
+ fi
+ if [[ $state != infofiles* ]]; then
tags+=( menu-items )
items=( ${items%:*} )
fi
@@ -317,6 +321,7 @@ if [[ -n $state ]]; then
_requested menu-items expl 'menu item' compadd -M 'm:{a-zA-Z}={A-Za-z}' -a items && ret=0
_requested -x index-entries expl 'index entry' compadd -M 'm:{a-zA-Z}={A-Za-z}' -a items && ret=0
_requested info-nodes expl 'node' compadd -M 'm:{a-zA-Z}={A-Za-z}' ${nodes#*:} && ret=0
+ _requested files expl 'file' && _files -g '*.info(|.gz|.bz2)'
(( ret )) || break
done