# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1245138565 -7200
# Node ID 5e4da3b3747e57360e6c7eb5a3d3b5fe69974ede
# Parent  52bde0edd23a46ccae022c7b26b04fe6735aece2
fix context restoration in error state

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-16  Jaroslav Hajek  <highegg@gmail.com>
+
+	* symtab.h (symbol_table::set_scope_and_context): Avoid checking
+	error_state for setting context.
+
 2009-06-15  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-re-mat.h (octave_matrix::octave_matrix (const Array<octave_idx_type>&,
diff --git a/src/symtab.h b/src/symtab.h
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -939,11 +939,12 @@
 		instance = p->second;
 
 		xcurrent_scope = scope;
+
+                xcurrent_context = context;
 	      }
 	  }
-
-	if (! error_state)
-	  xcurrent_context = context;
+        else
+          xcurrent_context = context;
       }
   }