summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@ipost.com>2021-10-31 14:31:26 -0700
committerBart Schaefer <schaefer@ipost.com>2021-10-31 14:31:26 -0700
commit6b2d120077e4a1c240d3d62e5b6e228eb88dd4a3 (patch)
tree4610a4e226e65a4c89f2ef331abb536e710f5b4f
parent68c8c60eaab795353e30218a4c41615328697256 (diff)
downloadzsh-6b2d120077e4a1c240d3d62e5b6e228eb88dd4a3.tar.gz
zsh-6b2d120077e4a1c240d3d62e5b6e228eb88dd4a3.zip
users/27302: _remote_files respects setting of AUTO_REMOVE_SLASH option
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Type/_remote_files5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 87d8536a7..4bc42ce9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-10-31 Bart Schaefer <schaefer@zsh.org>
+
+ * users/27302: Completion/Unix/Type/_remote_files: respect setting
+ of AUTO_REMOVE_SLASH option
+
2021-10-30 Oliver Kiddle <opk@zsh.org>
* 49533: Src/utils.c: add null check for preprompt functions list
diff --git a/Completion/Unix/Type/_remote_files b/Completion/Unix/Type/_remote_files
index b537406a0..93e1b7f43 100644
--- a/Completion/Unix/Type/_remote_files
+++ b/Completion/Unix/Type/_remote_files
@@ -85,12 +85,15 @@ if zstyle -T ":completion:${curcontext}:files" remote-access; then
remdispf=( ${(M)remdispf:#${~glob[2]}} )
fi
+ local -a autoremove
+ [[ -o autoremoveslash ]] && autoremove=(-r "/ \t\n\-")
+
_tags remote-files
while _tags; 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 \
+ compadd ${suf:+-S/} $autoremove "$args[@]" "$expl[@]" -d remdispd \
-- ${(q)remdispd%/} && ret=0
done
(( ret )) || return 0