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 21602 invoked from network); 22 Mar 2022 09:36:05 -0000
Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368)
by inbox.vuxu.org with ESMTPUTF8; 22 Mar 2022 09:36:05 -0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1647941765;
b=kmJoMzB08YUyqmpPOMGTirxmR9nVg/F1MSK/352NyKvi6snS8xuCtL9ocTGzXxA5BMB61wSElm
47mEFT/GYIVx/4PfmKznltc6xvVryMoqud/tK2MUfi90KzBK2Df0msXo4g/drSMBJdWP+OxBWT
DjQ1wPXQEpmHnvlcIGh5D+AM5gYvWN1MfSpG6EKiFRvi9B78rKCHYCziJP1WNXwbZfd8vxkwNi
zJeN8/Pma8Rv9qXmCamKLdM2Crl+JuKdg0G/Lia3DG4RQfCDztYlu+bSBVUOPiWM/JqTurJpsq
pD2H7Tf/Yab1YcFJs+8F/WsRfajIBFDofrUJ91mnbVIClQ==;
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=1647941765;
bh=CkFA9mJvg3hK1VHo/hMwOMgRDQkOS6yPXkazkGYIh7A=;
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=S43V57EA4mXyCqLkOLk/dufGkA1o8elQ2YoOU0h2F+cqpej/ds2OknGSIgJA90ETj29C0sBHjP
rcNaiLTI5nJoVc7XeL2+EUzhv0zU3zUk6CizgHrMy3jbpG85C4LMm7nameUPJ2k0qyvqko4Zig
m8PJ23MU8yFW7K7ma1LsbEAa3W70SrBa85yxv7JbjK/F3/0WeizwdGXq/nTukCXF7FJujrxXG8
evm0vxmBKXyM/QCuKTMpwgopKFs6nP1yGmkyu4WSXJ9XjHMau86Qw2NJhG8GDR9EgDDYmvR7sp
YxwnGinEGtbKnuW2fzE8mTK3ZlT7ysulW2rtJDnELJeupw==;
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=g+7DibSJ8IUciaBOBwaLoFSDhFr4YNqFb/+stsrWBJc=; b=gws2MRK80OmdFktudK2we8zz5g
ueEMNllNuomH/MOVz6Dl3hR2idUCHKgN6jBTdldJZtQxTjsDFD8/0GkfeI9wBAgLCxvL6ytpHgB6q
LYuhOpAwTOTfBP9oCdwnUjeRKMgG9geHHS0Rl/vVK9kq8MUcs4jg3E9TnMsXdzsFxP6gJt1LCGJgB
qsjeTlvpy3EcqX3AwwXvLBnFFg8Y/tuFuMCZYilNaM+M3JwxnbiGSsbmjYBDxsppbiJKolPW39bBt
EH/GZUqnQeBYCxvDMMXq5w/omB7obsSPVau2h5EpSVWMR2UYW6artLq5d+EHWPBeEqyHGXasEL2sD
JD3+nmcQ==;
Received: from authenticated user by zero.zsh.org with local
id 1nWavs-00033E-FY; Tue, 22 Mar 2022 09:36:04 +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]:41554)
by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256)
id 1nWavI-0002jq-L5; Tue, 22 Mar 2022 09:35:29 +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 1nWavI-0008W0-0G
for zsh-workers@zsh.org; Tue, 22 Mar 2022 10:35:28 +0100
Received: from oxbe25.tb.ukmail.iss.as9143.net ([172.25.160.156])
by smtp1.tb.ukmail.iss.as9143.net with ESMTP
id WavHn3gJyBAYNWavHnCLVA; Tue, 22 Mar 2022 10:35:27 +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=6239985f cx=a_exe
a=NA7IgXeTfPXpJV+SL5V8Rw==:117 a=wbvTLvLwOfMA:10 a=IkcTkHD0fZMA:10
a=7H6ixmLU1AQA:10 a=YR4_K0clAAAA:8 a=HD6IYYTscAeni3bLcgYA:9 a=QEXdDO2ut3YA:10
a=waMAY2KAzxQUlx2gRwsv: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=1647941727;
bh=CkFA9mJvg3hK1VHo/hMwOMgRDQkOS6yPXkazkGYIh7A=;
h=Date:From:To:In-Reply-To:References:Subject;
b=pSC1U57KbUIgamG5AJIwKeyV+vMZaHolTyRsqkLCkf/++8+Va1fIbMZgxr30cyqlz
vGg6OXK4jKDXp3ocFMIucbir4k1buxQMADIccl/XucPzPImNkHKo2T/w1sd6vK5g5L
UOaydmJs+IYjsnIxY6F0mlNVTT2mIcamI0vFUTutaS/CaTxP5Uh0UB4oyX2VSrKs6u
l2b6UM9qzKweGsRq764gLXgtuSU4Oij40Xk1xMinYRlE5jAYsUl56luoZrl3HsBiIk
1W/YwnJzZ9xp01oExcSymyCJVzmF5Rxoy/uhSkDAawI7KvYQFRvDvTruFkZfnAzwlL
QxU0AfP1iFQxA==
Date: Tue, 22 Mar 2022 09:35:27 +0000 (GMT)
From: Peter Stephenson
To: Vincent Lefevre , zsh-workers@zsh.org
Message-ID: <1943478022.568059.1647941727518@mail2.virginmedia.com>
In-Reply-To: <20220318135953.GA35304@zira.vinc17.org>
References: <20220315171305.GB617047@zira.vinc17.org>
<65163150.28923.1647367522118@mail2.virginmedia.com>
<2C495A59-EBA8-4C23-B0BB-964C4F0FEA40@kba.biglobe.ne.jp>
<20220318135953.GA35304@zira.vinc17.org>
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: MS4xfPKFZ+qnJM99G5U4Z0MKHXvndl22fDs6rJvn/hu87Q16G9iFkXBBw4LHJwmmh5GmRHwsH+lYMYd6uZlZiSRHbhIGkltsaLS2GFyceIPBuapfD0v5ai88
ZC6phGjEC6dduFE8u92f9qWJVetC0caXPWTXToeT+36aAy/QBuObGpk3VMkf9IreuNHNmNnX0f/8TL2vP45L/yU85nvjtllA35pvPGBtGcM/bIFSt4Ho9sol
Ibwvl1f6viPXZnX6HNHX0w==
X-Seq: 49875
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 18 March 2022 at 13:59 Vincent Lefevre wrote:
> On 2022-03-16 17:46:28 +0900, Jun T wrote:
> > 'info -f' accept any (relative or absolute) pathnames.
>
> Well, not exactly. It seems that the rule for "info -f" is that
> if the argument does not have a slash, then the usual info path
> is used (with no fallback if nothing is found, i.e. an existing
> pathname in the current directory will be ignored), otherwise
> the argument is regarded as a pathname.
So we can require a slash before adding the raw file completion.
pws
diff --git a/Completion/Unix/Command/_texinfo b/Completion/Unix/Command/_texinfo
index 7dfa32e45..2f5d0f91f 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+ && $PREFIX$SUFFX = */* ]]; 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