From 5660cebaf66b47f927d468422b7c1ad516c32916 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Tue, 1 Sep 2015 00:51:28 +0900
Subject: [PATCH] [zsh-completion] Temporarily unset shwordsplit (#328)

---
 shell/completion.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/shell/completion.zsh b/shell/completion.zsh
index 57c4222..f45c538 100644
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -99,7 +99,11 @@ EOF
 }
 
 fzf-completion() {
-  local tokens cmd prefix trigger tail fzf matches lbuf d_cmds
+  local tokens cmd prefix trigger tail fzf matches lbuf d_cmds sws
+  if setopt | grep shwordsplit > /dev/null; then
+    sws=1
+    unsetopt shwordsplit
+  fi
 
   # http://zsh.sourceforge.net/FAQ/zshfaq03.html
   # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
@@ -148,6 +152,7 @@ fzf-completion() {
   else
     eval "zle ${fzf_default_completion:-expand-or-complete}"
   fi
+  [ -n "$sws" ] && setopt shwordsplit
 }
 
 [ -z "$fzf_default_completion" ] &&