summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Type/_remote_files4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 64ac1b38b..6af28f976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-09-12  Oliver Kiddle  <opk@zsh.org>
 
+	* 39295: Completion/Unix/Type/_remote_files: allow '--' to
+	appear in the command line passed as an argument
+
 	* 39287: Completion/Unix/Command/_graphicsmagick,
 	Completion/Unix/Command/_imagemagick, Completion/X/Command/_okular:
 	add .tif as a valid extension for TIFF files
diff --git a/Completion/Unix/Type/_remote_files b/Completion/Unix/Type/_remote_files
index 54bd438eb..dbfb56134 100644
--- a/Completion/Unix/Type/_remote_files
+++ b/Completion/Unix/Type/_remote_files
@@ -38,9 +38,9 @@ if zstyle -T ":completion:${curcontext}:files" remote-access; then
   zparseopts -D -E -a args / g:=glob h:=host
   (( $#host)) && shift host || host="${IPREFIX%:}"
 
-  args=( ${argv[1,(I)--]} )
+  args=( ${argv[1,(i)--]} )
   shift ${#args}
-  args[-1]=()
+  [[ args[-1] = -- ]] && args[-1]=()
   # Command to run on the remote system.
   cmd="$1"
   shift