===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.49
retrieving revision 1.51
diff -u -p -r1.49 -r1.51
--- OpenXM_contrib2/asir2000/parse/glob.c	2004/05/14 09:20:57	1.49
+++ OpenXM_contrib2/asir2000/parse/glob.c	2004/11/24 06:01:04	1.51
@@ -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.48 2004/02/27 09:13:04 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.50 2004/06/30 06:26:39 fujiwara Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -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);
@@ -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');