===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.60
retrieving revision 1.63
diff -u -p -r1.60 -r1.63
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2006/02/11 09:10:16	1.60
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2006/06/21 09:46:06	1.63
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.59 2006/02/08 02:11:19 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.62 2006/02/25 06:33:31 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -191,6 +191,7 @@ void ox_main(int argc,char **argv) {
 						asir_push_one((Obj)err);
 						while ( NEXT(asir_infile) )
 							closecurrentinput();
+						resetpvs();
 					}
 					break;
 				}
@@ -703,6 +704,7 @@ int asir_executeString()
 #else
 	parse_strp = cmd;
 #endif
+	asir_infile->ln = 1;
 	if ( mainparse(&snode) ) {
 		return -1;
 	}
@@ -858,6 +860,7 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	FILE *ifp;
 	char *homedir;
 	char *ptr;
+	int do_server_sav;
 #if !defined(VISUAL)
 	int tmp;
 #endif
@@ -916,8 +919,11 @@ void ox_asir_init(int argc,char **argv,char *servernam
 
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		fclose(ifp);
+		do_server_sav = do_server_in_X11;
+		do_server_in_X11 = 0;
 		if ( !SETJMP(main_env) )
 			execasirfile(ifname);
+		do_server_in_X11 = do_server_sav;
 	}
 
 /* XXX Windows compatibility */