Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: scp completion options



On Wed, 27 Jun 2018 09:15:14 +0100
Peter Stephenson <p.stephenson@xxxxxxxxxxx> wrote:
>..,
> But actually I don't see how to get this to work in the case you're
> talking about (hence the question marks), because the tag for remote
> files is just 'files' so will allow it to complete local files.  This
> looks to me like a mistake, and _remote_files should arrange for a
> different tag.
> 
> I may be missing something, but if I'm not, changing _remote_files
> ought to be easy.

This does appear to do the trick.  I propose to submit this.

pws

diff --git a/Completion/Unix/Type/_remote_files b/Completion/Unix/Type/_remote_files
index a5fce9a..267715a 100644
--- a/Completion/Unix/Type/_remote_files
+++ b/Completion/Unix/Type/_remote_files
@@ -75,9 +75,9 @@ if zstyle -T ":completion:${curcontext}:files" remote-access; then
     remdispf=( ${(M)remdispf:#${~glob[2]}} )
   fi
 
-  _tags files
+  _tags remote-files
   while _tags; do
-    while _next_label files expl ${suf:-remote directory}; do
+    while _next_label remote-files expl ${suf:-remote directory}; do
       [[ -n $suf ]] &&
           compadd "$args[@]" "$expl[@]" -d remdispf -- ${(q)remdispf%[*=|]} && ret=0
       compadd ${suf:+-S/} -r "/ \t\n\-" "$args[@]" "$expl[@]" -d remdispd \
diff --git a/README b/README
index 2cf2266..fd4c59e 100644
--- a/README
+++ b/README
@@ -32,9 +32,17 @@ Zsh is a shell with lots of features.  For a list of some of these, see the
 file FEATURES, and for the latest changes see NEWS.  For more
 details, see the documentation.
 
-Incompatibilities since 5.4.2
+Incompatibilities since 5.5.1
 -----------------------------
 
+The completion helper _remote_files, typically used after a hostname
+with scp-style completion, now uses remote-files instead of files as a
+tag.  This makes it easier to restrict completions with the tag-order
+style.
+
+Incompatibilities between 5.4.2 and 5.5.1
+-----------------------------------------
+
 1) The default build-time maximum nested function depth has been
 decreased from 1000 to 500 based on user experience.  However,
 it can now be changed at run time via the variable FUNCNEST.



Messages sorted by: Reverse Date, Date, Thread, Author