===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot.c,v
retrieving revision 1.16
retrieving revision 1.21
diff -u -p -r1.16 -r1.21
--- OpenXM_contrib2/asir2000/plot/ox_plot.c	2002/07/10 05:29:36	1.16
+++ OpenXM_contrib2/asir2000/plot/ox_plot.c	2006/02/08 02:11:20	1.21
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.15 2001/12/27 07:51:18 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.20 2004/02/13 05:48:36 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,7 +53,7 @@
 #include "ifplot.h"
 #include "version.h"
 #include <signal.h>
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
@@ -64,7 +64,9 @@ extern Obj *asir_OperandStack;
 extern int asir_OperandStackPtr;
 
 /* environement is defined in libpari.a */
+#if !(PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;
+#endif
 
 extern int do_message;
 extern int ox_flushing;
@@ -72,10 +74,10 @@ extern JMP_BUF ox_env;
 extern MATHCAP my_mathcap;
 extern char LastError[];
 
-void create_error(ERR *,unsigned int ,char *);
+void create_error(ERR *,unsigned int ,char *,LIST );
 
 void ox_io_init();
-void ox_asir_init(int,char **);
+void ox_asir_init(int,char **,char *);
 Obj asir_pop_one();
 void asir_push_one(Obj);
 void asir_end_flush();
@@ -106,7 +108,7 @@ void ox_plot_main(int argc,char **argv)
 	int use_x;
 
 #if !defined(VISUAL)
-	ox_asir_init(argc,argv);
+	ox_asir_init(argc,argv,"ox_plot");
 	use_x = init_plot_display(argc,argv);
 	if ( use_x )
 		ds = ConnectionNumber(display);
@@ -162,7 +164,7 @@ static void process_ox()
 				fprintf(stderr," %s\n",name_of_cmd(cmd));
 			if ( ret = SETJMP(main_env) ) {
 				if ( ret == 1 ) {
-					create_error(&err,serial,LastError);
+					create_error(&err,serial,LastError,0);
 					asir_push_one((Obj)err);
 				}
 				break;
@@ -238,6 +240,7 @@ static void asir_do_cmd(unsigned int cmd,unsigned int 
 			client_mathcap = (MATHCAP)asir_pop_one();
 			store_remote_mathcap(0,client_mathcap);
 			break;
+		case SM_nop:
 		default:
 			break;
 	}
@@ -282,12 +285,12 @@ static void asir_executeFunction(int serial)
 		drawcircle(n);
 	} else if ( !strcmp(func,"draw_obj") ) {
 		if ( draw_obj(n) < 0 ) {
-			create_error(&err,serial,LastError);
+			create_error(&err,serial,LastError,0);
 			asir_push_one((Obj)err);
 		}	
 	} else if ( !strcmp(func,"draw_string") ) {
 		if ( draw_string(n) < 0 ) {
-			create_error(&err,serial,LastError);
+			create_error(&err,serial,LastError,0);
 			asir_push_one((Obj)err);
 		}
 	} else if ( !strcmp(func,"clear_canvas") ) {