# HG changeset patch
# User jwe
# Date 753274874 0
# Node ID 82c050e70f7a6ce1826369719134c4857522cdcd
# Parent  a592507b3badea913d9c4777196be1689e82f9ec
[project @ 1993-11-14 10:58:11 by jwe]

diff -r a592507b3bad -r 82c050e70f7a liboctave/Makefile.in
--- a/liboctave/Makefile.in	Sun Nov 14 10:54:16 1993 +0000
+++ b/liboctave/Makefile.in	Sun Nov 14 11:01:14 1993 +0000
@@ -30,13 +30,14 @@
 INCLUDES = Bounds.h CollocWt.h DAE.h DAEFunc.h FEGrid.h FSQP.h \
 	LinConst.h LP.h LPsolve.h Matrix.h NLConst.h NLEqn.h \
 	NLFunc.h NLP.h NPSOL.h ODE.h ODEFunc.h Objective.h QLD.h \
-	QP.h QPSOL.h Quad.h Range.h f77-uscore.h sun-utils.h
+	QP.h QPSOL.h Quad.h Range.h f77-uscore.h sun-utils.h \
+	liboctave-error.h
 
 SOURCES = Bounds.cc ColVector.cc CollocWt.cc DAE.cc DAEFunc.cc \
 	DiagMatrix.cc FEGrid.cc FSQP.cc LinConst.cc LP.cc LPsolve.cc \
 	Matrix-ext.cc Matrix.cc NLConst.cc NLEqn.cc NLFunc.cc NPSOL.cc \
 	Objective.cc ODE.cc ODEFunc.cc QLD.cc QP.cc QPSOL.cc Quad.cc \
-	Range.cc RowVector.cc sun-utils.cc
+	Range.cc RowVector.cc sun-utils.cc liboctave-error.cc
 
 EXTRAS = mx-inlines.cc
 
diff -r a592507b3bad -r 82c050e70f7a liboctave/lo-error.h
--- a/liboctave/lo-error.h	Sun Nov 14 10:54:16 1993 +0000
+++ b/liboctave/lo-error.h	Sun Nov 14 11:01:14 1993 +0000
@@ -41,9 +41,6 @@
 
 extern void liboctave_fatal (const char *fmt, ...);
 
-// Current error state.
-extern int error_state;
-
 #endif
 
 /*
diff -r a592507b3bad -r 82c050e70f7a src/octave.cc
--- a/src/octave.cc	Sun Nov 14 10:54:16 1993 +0000
+++ b/src/octave.cc	Sun Nov 14 11:01:14 1993 +0000
@@ -44,6 +44,8 @@
 
 #include "getopt.h"
 
+#include "liboctave-error.h"
+
 #include "sighandlers.h"
 #include "variables.h"
 #include "error.h"
@@ -383,6 +385,9 @@
 // This is not really the right place to do this...
   set_Complex_error_handler (octave_Complex_error_handler);
 
+// Or this, probably...
+  set_liboctave_error_handler (error);
+
 // Do this first, since some command line arguments may override the
 // defaults.
   initialize_globals (argv[0]);