# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1607681739 18000
# Node ID 4363b185d31ffb350393438bd08efa2543682f34
# Parent  254ee9af5014c4bd3bc7b934b273a97e3e5be590# Parent  32fdcf67a683f0710367da3a95ca9a8fc9a9c1aa
maint: merge stable to default.

diff -r 254ee9af5014 -r 4363b185d31f libinterp/corefcn/mex.cc
--- a/libinterp/corefcn/mex.cc	Thu Dec 10 15:27:14 2020 -0800
+++ b/libinterp/corefcn/mex.cc	Fri Dec 11 05:15:39 2020 -0500
@@ -4329,6 +4329,16 @@
 
   try
     {
+      octave::tree_evaluator& tw = interp.get_evaluator ();
+
+      octave::unwind_action act
+        ([&tw] (const std::list<octave::octave_lvalue> *lvl)
+         {
+           tw.set_lvalue_list (lvl);
+         }, tw.lvalue_list ());
+
+      tw.set_lvalue_list (nullptr);
+
       retval = octave::feval (fname, args, nargout);
     }
   catch (const octave::execution_exception&)