--- a/src/sighandlers.cc	Thu Mar 06 09:45:51 1997 +0000
+++ b/src/sighandlers.cc	Fri Mar 07 02:21:37 1997 +0000
@@ -114,7 +114,7 @@
       octave_set_signal_handler (SIGABRT, SIG_DFL);
 #endif
 
-      error ("attempted clean up seems to have failed -- aborting...");
+      cerr << "error: attempted clean up apparently failed -- aborting...\n";
 
       abort ();
     }
@@ -122,7 +122,7 @@
     {
       been_there_done_that = true;
 
-      error ("%s -- stopping myself...", sig_name);
+      cerr << "error: " << sig_name << " -- stopping myself...\n";
 
       save_user_variables ();
 
@@ -135,7 +135,7 @@
 static void
 octave_new_handler (void)
 {
-  error ("memory exhausted -- trying to return to prompt");
+  cerr << "error: memory exhausted -- trying to return to prompt\n";
 
   if (can_interrupt)
     {
@@ -247,7 +247,7 @@
 
   MAYBE_REINSTALL_SIGHANDLER (SIGFPE, sigfpe_handler);
 
-  error ("floating point exception -- trying to return to prompt");
+  cerr << "error: floating point exception -- trying to return to prompt\n";
 
   if (can_interrupt)
     {
@@ -289,7 +289,7 @@
   MAYBE_REINSTALL_SIGHANDLER (SIGPIPE, sigpipe_handler);
 
   if (pipe_handler_error_count++ == 0)
-    warning ("broken pipe");
+    cerr << "warning: broken pipe\n";
 
   // Don't loop forever on account of this.