A parent shell's enclosing_envars should be updated by its sub-shell.

ywangd · ywangd · commit 95758e436f33 · 2014-12-20T23:49:40.000+11:00
Also added enclosing_aliases.
diff --git a/stash.py b/stash.py
@@ -828,6 +828,7 @@ def __init__(self, app):
         self.retval = 0
 
         self.enclosing_envars = {}
+        self.enclosing_aliases = {}
 
         self.state_stack = []
         self.io_stack = []
@@ -848,12 +849,14 @@ def save_state(self):
                  dict(self.aliases),
                  os.getcwd(),
                  dict(self.enclosing_envars),
+                 dict(self.enclosing_aliases),
                  sys.argv[:],
                  sys.path[:],
                  dict(os.environ),
                 ])
             # new enclosed envars
             self.envars.update(self.enclosing_envars)
+            self.aliases.update(self.enclosing_aliases)
             self.enclosing_envars = {}
 
     def restore_state(self,
@@ -873,10 +876,14 @@ def restore_state(self,
              self.aliases,
              cwd,
              self.enclosing_envars,
+             self.enclosing_aliases,
              sys.argv,
              sys.path,
              os.environ) = self.state_stack.pop()
 
+            self.enclosing_envars.update(saved_envars)
+            self.enclosing_aliases.update(saved_aliases)
+
             if persist_envars:
                 self.envars.update(saved_envars)
 
