From 97123dbf73019af97f0301569ef1247e38144caa Mon Sep 17 00:00:00 2001
From: Jarrod Moore <MasterNayru@users.noreply.github.com>
Date: Fri, 17 Nov 2017 06:19:16 +1100
Subject: [PATCH] Fix zsh alias (#733)

---
 thefuck/shells/zsh.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/thefuck/shells/zsh.py b/thefuck/shells/zsh.py
index 1498837e..90ffdb2e 100644
--- a/thefuck/shells/zsh.py
+++ b/thefuck/shells/zsh.py
@@ -13,14 +13,16 @@ class Zsh(Generic):
         # It is VERY important to have the variables declared WITHIN the function
         return '''
             {name} () {{
-                TF_HISTORY=$(fc -ln -10)
+                TF_PYTHONIOENCODING=$PYTHONIOENCODING;
+                export TF_ALIAS={name};
+                export TF_SHELL_ALIASES=$(alias);
+                export TF_HISTORY="$(fc -ln -10)";
+                export PYTHONIOENCODING=utf-8;
                 TF_CMD=$(
-                    TF_ALIAS={name}
-                    TF_SHELL_ALIASES=$(alias)
-                    TF_HISTORY=$TF_HISTORY
-                    PYTHONIOENCODING=utf-8
-                    thefuck {argument_placeholder} $*
+                    thefuck {argument_placeholder} $@
                 ) && eval $TF_CMD;
+                unset TF_HISTORY;
+                export PYTHONIOENCODING=$TF_PYTHONIOENCODING;
                 {alter_history}
             }}
         '''.format(