From 1c942291f8a41d80d7db4e7513adf06edfe50277 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Fri, 30 Jan 2015 16:24:20 +0000
Subject: 34435: Update emulate completion.

Add new feature to run command in emulation.

Factor out handling of quoted command string to new function.
---
 Completion/Unix/Command/_sh     | 3 +--
 Completion/Unix/Type/_cmdstring | 6 ++++++
 Completion/Zsh/Command/_emulate | 6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 Completion/Unix/Type/_cmdstring

(limited to 'Completion')

diff --git a/Completion/Unix/Command/_sh b/Completion/Unix/Command/_sh
index 104c7576c..21ebfc3b2 100644
--- a/Completion/Unix/Command/_sh
+++ b/Completion/Unix/Command/_sh
@@ -10,8 +10,7 @@ if [[ $service == zsh ]]; then
 fi
 
 if (( CURRENT == ${words[(i)-c]} + 1 )); then
-  compset -q
-  _normal
+  _cmdstring
 else
   local n=${words[(b:2:i)[^-]*]}
   if (( n <= CURRENT )); then
diff --git a/Completion/Unix/Type/_cmdstring b/Completion/Unix/Type/_cmdstring
new file mode 100644
index 000000000..fb19fdb76
--- /dev/null
+++ b/Completion/Unix/Type/_cmdstring
@@ -0,0 +1,6 @@
+#autoload
+
+# This is for a quoted argument that will be interpreted as a command.
+
+compset -q
+_normal
diff --git a/Completion/Zsh/Command/_emulate b/Completion/Zsh/Command/_emulate
index e562d6834..d6fb0c3d9 100644
--- a/Completion/Zsh/Command/_emulate
+++ b/Completion/Zsh/Command/_emulate
@@ -1,6 +1,8 @@
 #compdef emulate
 
-_arguments -C -s -A "-*" \
+_arguments -C -s \
   '-L[set local_options and local_traps as well]' \
   '-R[reset all options instead of only those needed for script portability]' \
-  '::shell to emulate:(zsh sh ksh csh)'
+  '1:shell to emulate:(zsh sh ksh csh)' \
+  '2:specify optional command:(-c)' \
+  '3:command:_cmdstring'
-- 
cgit 1.4.1