# HG changeset patch
# User Michael C. Grant <mcg@cvxr.com>
# Date 1392991537 21600
# Node ID 83f5f2d414865e0826ab254ac5561d9caaa9fbdd
# Parent  9831d6b4c5a7482685b376782d56a6303c573489
correctly handle nested evalin ('caller', ...) calls at top scope (bug #41651)

* toplev.cc (octave_call_stack::do_goto_caller_frame): Compare scope of
current stack element to scope of the top of the call stack instead of
checking whether the current frame is 0.

diff -r 9831d6b4c5a7 -r 83f5f2d41486 libinterp/corefcn/toplev.cc
--- a/libinterp/corefcn/toplev.cc	Fri Feb 21 14:58:30 2014 -0500
+++ b/libinterp/corefcn/toplev.cc	Fri Feb 21 08:05:37 2014 -0600
@@ -469,7 +469,7 @@
 
       octave_function *f = elt.fcn;
 
-      if (frame == 0 || (f && f->is_user_code ()))
+      if (elt.scope == cs[0].scope || (f && f->is_user_code ()))
         {
           if (! skipped)
             // We found the current user code frame, so skip it.