zsh-workers
 help / color / mirror / code / Atom feed
From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: zsh-workers@zsh.org
Subject: Re: completion for "info -f" does not work
Date: Thu, 17 Mar 2022 16:29:22 +0000 (GMT)	[thread overview]
Message-ID: <274918484.477546.1647534562812@mail2.virginmedia.com> (raw)
In-Reply-To: <1A53A198-35F4-44D3-9B85-86A79A0233C9@kba.biglobe.ne.jp>

> On 16 March 2022 at 15:28 "Jun. T" <takimoto-j@kba.biglobe.ne.jp> wrote:
> > 2022/03/17 0:06, Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> > 
> >> On 16 March 2022 at 08:46 Jun T <takimoto-j@kba.biglobe.ne.jp> wrote:
> >>> 2022/03/16 3:05, Peter Stephenson <p.w.stephenson@ntlworld.com> 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


  reply	other threads:[~2022-03-17 16:30 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-15 17:13 Vincent Lefevre
2022-03-15 18:05 ` Peter Stephenson
2022-03-16  8:46   ` Jun T
2022-03-16 15:06     ` Peter Stephenson
2022-03-16 15:13       ` Bart Schaefer
2022-03-16 15:28       ` Jun. T
2022-03-17 16:29         ` Peter Stephenson [this message]
2022-03-18 13:59     ` Vincent Lefevre
2022-03-18 14:09       ` Vincent Lefevre
2022-03-22  9:46         ` Jun T
2022-03-22 13:32           ` Vincent Lefevre
2022-03-22  9:35       ` Peter Stephenson

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=274918484.477546.1647534562812@mail2.virginmedia.com \
    --to=p.w.stephenson@ntlworld.com \
    --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).