===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.48
retrieving revision 1.52
diff -u -p -r1.48 -r1.52
--- OpenXM_contrib2/asir2000/parse/glob.c	2004/02/27 09:13:04	1.48
+++ OpenXM_contrib2/asir2000/parse/glob.c	2004/12/15 22:51:40	1.52
@@ -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/parse/glob.c,v 1.47 2004/02/25 06:43:52 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.51 2004/11/24 06:01:04 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -83,7 +83,7 @@ extern FILE *asir_out;
 
 INFILE asir_infile;
 JMP_BUF main_env,debug_env,timer_env,exec_env;
-int little_endian,debug_mode;
+int little_endian,debug_mode,no_debug_on_error;
 char *asir_libdir;
 char *asir_pager;
 
@@ -100,8 +100,8 @@ int do_server_in_X11;
 Obj LastVal;
 char LastError[BUFSIZ];
 int timer_is_set;
+NODE current_option;
 
-
 struct oV oVAR[] = {
 	{"x",0,0}, {"y",0,0}, {"z",0,0}, {"u",0,0},
 	{"v",0,0}, {"w",0,0}, {"p",0,0}, {"q",0,0},
@@ -695,13 +695,14 @@ void set_lasterror(char *s)
 }
 
 SNODE error_snode;
+int error_in_timer;
 
 void error(char *s)
 {
 	SNODE *snp=0;
 
 #if !defined(VISUAL)
-	if ( timer_is_set )
+	if ( !error_in_timer && timer_is_set )
 		alrm_handler(SIGVTALRM);
 #endif
 	fprintf(stderr,"%s\n",s);
@@ -726,7 +727,7 @@ void error(char *s)
 	if ( debug_mode )
 		LONGJMP(debug_env,1);
 	if ( CPVS != GPVS )
-		if ( do_server_in_X11 || isatty(0) )
+		if ( !no_debug_on_error && (do_server_in_X11 || isatty(0)) )
 			bp(error_snode);
 	if ( read_exec_file )
 		read_exec_file = 0;
@@ -809,7 +810,7 @@ char *get_intervalversion()
 
 void copyright()
 {
-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2003, Risa/Asir committers, http://www.openxm.org/.\nGC 6.2(alpha6) copyright 1988-2003, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2004, Risa/Asir committers, http://www.openxm.org/.\nGC 6.2(alpha6) copyright 1988-2003, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
 	if ( asir_texmacs ) printf("\2verbatim:");
 	printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());
 	if ( asir_texmacs ) putchar('\5');