#74: #103: #221: Go back in history if alias is misspelled

thefuck/shells/bash.py

@@ -11,14 +11,15 @@ class Bash(Generic):
         # It is VERY important to have the variables declared WITHIN the function
         return '''
             function {name} () {{
-                TF_PREVIOUS=$(fc -ln -1);
                 TF_PYTHONIOENCODING=$PYTHONIOENCODING;
                 export TF_ALIAS={name};
                 export TF_SHELL_ALIASES=$(alias);
+                export TF_HISTORY=$(fc -ln -10);
                 export PYTHONIOENCODING=utf-8;
                 TF_CMD=$(
-                    thefuck $TF_PREVIOUS {argument_placeholder} $@
+                    thefuck {argument_placeholder} $@
                 ) && eval $TF_CMD;
+                unset TF_HISTORY;
                 export PYTHONIOENCODING=$TF_PYTHONIOENCODING;
                 {alter_history}
             }}

thefuck/shells/zsh.py

@@ -12,12 +12,13 @@ class Zsh(Generic):
         # It is VERY important to have the variables declared WITHIN the function
         return '''
             {name} () {{
-                TF_PREVIOUS=$(fc -ln -1 | tail -n 1);
+                TF_HISTORY=$(fc -ln -10)
                 TF_CMD=$(
                     TF_ALIAS={name}
                     TF_SHELL_ALIASES=$(alias)
+                    TF_HISTORY=$TF_HISTORY
                     PYTHONIOENCODING=utf-8
-                    thefuck $TF_PREVIOUS {argument_placeholder} $*
+                    thefuck {argument_placeholder} $*
                 ) && eval $TF_CMD;
                 {alter_history}
             }}