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 23403 invoked from network); 15 Mar 2022 18:05:42 -0000
Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368)
by inbox.vuxu.org with ESMTPUTF8; 15 Mar 2022 18:05:42 -0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1647367542;
b=fC/7ulzZOhxJ1nkQXpOhGZHnhNpK3bJrZ4+1Hrth968FvR+deZ6RpEA3RZWa+jabC5q6kvtTS3
s1UzP1s4WY1l4IgDuZPF9EohLIlUXyHfcgiVXASE9LvpPxiplGlakdByAqCPPGwx95+y7wM8vK
XWwnBz1YcukiqHRa3NM3NKjFVnpBbH0I+MT5rZQcacLoS99M2EyBTEuTrCOqyN6DJjgVJjQxHG
IY85yJVn2Ls999FS33AO+zdE2Up6UpxPw+zsWJaSKEV4YtAIOyOhKcgrUuydwm0gXMFj9QApqV
JjWXmU9D+0oQi9TClrKov7n7xeo1YhcL7TZU1/KY7Y3kVA==;
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=1647367542;
bh=sdSgth5vtx7uBxPocfaNsMpcVa5CVKJlGy9PcBPkim4=;
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=jNUkpc4bnKbExOVVGwmfvGy75yvtjj9LK7SSilbdVYGeCYZ5wRU2YWLeIoxjLZq1M7LyKtKcrP
l9U/ioHH4dfg/CHYCiRjYQFl9rMOOmYjU7MmQQMRK4BewHHA4Bjkp6iPv9C38Jy/IRskXVN1an
/DbYcZUPDSRPD1vTgK39sZsb5Z6R/onFACj89YUA9EgzLdWRUI6/HgT6Th9EihnRZk4PJNsEpJ
EUbDlH/ShyGTKG3Ub4S3AnwInNXBkkBhLAPDClxSFV4+z27t7dcMcgeLXK6fJc6z0H6Ga+riUy
UwMScdoXQlKVckCbltsWtN4rMNYhNszPZtKUkxEsim18gw==;
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=YM4BxCRkgt6sxKF5029S9jPE+e6n4g5cEbwOmbRpy/8=; b=DSoCXqaMiO8QFb2eoJ7+z5wkfE
1b/CV/elcgNwF84anHVzP2HH75NjS0rVpkcmkVswCvsujxEHiDLF8TXdL7GnKZiCD0FWMnE0wYnt3
g785XcnxKw8PDIy6WpFptrL0ekZ0A642mVXoj3/oUNOtPJ4uZISfW8B4gWW3sg335PG+7Zbgg8aHD
xV/DugoZEkG5gkctWdwYaBUtHkYM3WXk3FR3Q6p68qgMNcoIkLkjFb6DqggmOT2LAmw0X3t2VInFB
inn3xgfJFI+csFFRkaZ1xVFUBo7N7pLIOrzn72EvTnW4uEf80LpdHWbchz+8xsidmi41sQ+MGJwaa
3Toha+DQ==;
Received: from authenticated user by zero.zsh.org with local
id 1nUBYE-00083X-2N; Tue, 15 Mar 2022 18:05:42 +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]:51648)
by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256)
id 1nUBXu-0007j7-Nv; Tue, 15 Mar 2022 18:05:24 +0000
Received: from [212.54.57.82] (helo=smtp3.tb.ukmail.iss.as9143.net)
by smtpq1.tb.ukmail.iss.as9143.net with esmtp (Exim 4.90_1)
(envelope-from
)
id 1nUBXu-00010Z-6w
for zsh-workers@zsh.org; Tue, 15 Mar 2022 19:05:22 +0100
Received: from oxbe3.tb.ukmail.iss.as9143.net ([172.25.160.134])
by smtp3.tb.ukmail.iss.as9143.net with ESMTP
id UBXuniXo3l7D1UBXun4Oc4; Tue, 15 Mar 2022 19:05:22 +0100
X-Env-Mailfrom: p.w.stephenson@ntlworld.com
X-Env-Rcptto: zsh-workers@zsh.org
X-SourceIP: 172.25.160.134
X-CNFS-Analysis: v=2.4 cv=Xo7phHJ9 c=1 sm=1 tr=0 ts=6230d562 cx=a_exe
a=rX2mKgs1IZJU9lF6pltyEQ==:117 a=yNl-BSJ6BuoA:10 a=IkcTkHD0fZMA:10
a=4PkXBC9OHCoA:10 a=YR4_K0clAAAA:8 a=-g34EqK-TWtYnmUvg80A: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=1647367522;
bh=sdSgth5vtx7uBxPocfaNsMpcVa5CVKJlGy9PcBPkim4=;
h=Date:From:To:In-Reply-To:References:Subject;
b=N253olUGV4l8+ZuEhukIKKLhUA5KSl5DVsHAOp45dKTIsxXgN2O6WxpEbdXyMHZBj
Erh6OQIEi8oc76mgpop9LgPAC9HwNmUli7uFo053Pd43QUCj3uDD1BzLA25FHUlbYy
lNvU5IO3DfjJBuF0rmghg89dGP29QfEeBRro0YzzbE9oUC+ehYIF/fVDCHry4g9+a/
u1n++E/CAlD0N2SuStNhV53zUK+ONuS5sOPA/Vkb8zFL7cTuAfNEh5Itl7y5osCMqP
qhI+svnG4MWlRyWUvW372sBvebv0wIw49mQMGNO6yptgYxYR3Q1EZE/l7qPL0RAGsl
oxXOiyfYhMfyw==
Date: Tue, 15 Mar 2022 18:05:22 +0000 (GMT)
From: Peter Stephenson
To: Vincent Lefevre , zsh-workers@zsh.org
Message-ID: <65163150.28923.1647367522118@mail2.virginmedia.com>
In-Reply-To: <20220315171305.GB617047@zira.vinc17.org>
References: <20220315171305.GB617047@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.92
X-Originating-Client: open-xchange-appsuite
X-CMAE-Envelope: MS4xfL6C2NjOHhYKqdjA6RAI541X2zDOu5iQOOP2OZGENXLoHAdDnWzXfxA33cL3QuQdE6U4tiLQ5I6vN4x1lPDZjtjgCj6tZzPzmliYGbZiDb0kWYQrD015
bdxtkoi3sm5f0gzpgftcJJZ8JXKnejV9A5PW6Npqiz0Qf38WsJKZTgHfjBnz0FGehmicg4uhhgLBBURRqxZdX0Pi00mm6CpGCduhYX8KZ7utsOL0S7wvcQI/
HyVdkLj9Km105+z5tdNK8g==
X-Seq: 49850
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 15 March 2022 at 17:13 Vincent Lefevre wrote:
>
>
> In a directory where there is a file with the .info extension:
>
> zira% autoload -U compinit
> zira% compinit
> zira% info -f ./
>
> If I type [TAB], I don't get any completion. It should complete
> on the .info files (at least).
I guess this could be a fairly straightforward alternative to the
gory file munging, something like the following?
pws
diff --git a/Completion/Unix/Command/_texinfo b/Completion/Unix/Command/_texinfo
index 7dfa32e45..f169cba63 100644
--- a/Completion/Unix/Command/_texinfo
+++ b/Completion/Unix/Command/_texinfo
@@ -280,18 +280,25 @@ if [[ -n $state ]]; then
[[ -z $file ]] && file=${opt_args[-f]:-$line[1]}
if [[ $state = info* ]]; then
- local -aU files=( $^infopath/*.info(|.gz|.bz2)(-.:t:s/.gz//:s/.bz2//:r) )
- local items
- if (( ! $#files )); then
- _info_retrieve_nodes
- files=( ${(P)cache%%:*} )
- fi
- items=( ${${${(M)${(f)"$(_call_program menu-items info -o-)"}:#(#s)\* *: \(*}#??}%%\)*} )
- files+=( ${items##*\(} )
- tags=( info-files )
- if [[ $state != infofiles ]]; then
- tags+=( menu-items )
- items=( ${items%:*} )
+ local -aU files
+ if [[ $PREFIX = (./|../|/)* ]]; then
+ files=( $^infopath/*.info(|.gz|.bz2)(-.:t:s/.gz//:s/.bz2//:r) )
+ tags=(files)
+ items=()
+ else
+ files=( $^infopath/*.info(|.gz|.bz2)(-.:t:s/.gz//:s/.bz2//:r) )
+ local items
+ if (( ! $#files )); then
+ _info_retrieve_nodes
+ files=( ${(P)cache%%:*} )
+ fi
+ items=( ${${${(M)${(f)"$(_call_program menu-items info -o-)"}:#(#s)\* *: \(*}#??}%%\)*} )
+ files+=( ${items##*\(} )
+ tags=( info-files )
+ if [[ $state != infofiles ]]; then
+ tags+=( menu-items )
+ items=( ${items%:*} )
+ fi
fi
elif [[ $state = nodes ]]; then
tags=( menu-items )
@@ -317,6 +324,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