[w3m-dev 03388] meta refresh problem

* fm.h (AL_IMPLICIT_DONE): 3->4
	(AL_ONCE): 8
	(AL_IMPLICIT_ONCE): (AL_IMPLICIT|AL_ONCE)
* main.c (MAIN): & AL_IMPLICIT, & AL_IMPLICIT_DONE
	(SigAlarm): & AL_IMPLICIT, & AL_IMPLICIT_DONE, & AL_ONCE
	(setAlaramEvent): & AL_IMPLICIT
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

3 files changed, 24 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index e17e486..19c8be8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2002-11-09  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03388] meta refresh problem
+	* fm.h (AL_IMPLICIT_DONE): 3->4
+		(AL_ONCE): 8
+		(AL_IMPLICIT_ONCE): (AL_IMPLICIT|AL_ONCE)
+	* main.c (MAIN): & AL_IMPLICIT, & AL_IMPLICIT_DONE
+		(SigAlarm): & AL_IMPLICIT, & AL_IMPLICIT_DONE, & AL_ONCE
+		(setAlaramEvent): & AL_IMPLICIT
+
+2002-11-09  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03387] Re: tab browser
 	* buffer.c (newBuffer): buf->LINES initialize
 		(gotoLine): use buf->LINES
@@ -4418,4 +4428,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.486 2002/11/08 15:54:46 ukai Exp $
+$Id: ChangeLog,v 1.487 2002/11/08 16:01:18 ukai Exp $
diff --git a/fm.h b/fm.h
index 8afcc1a..0bf6bde 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.72 2002/11/08 15:54:47 ukai Exp $ */
+/* $Id: fm.h,v 1.73 2002/11/08 16:01:20 ukai Exp $ */
 /* 
  * w3m: WWW wo Miru utility
  * 
@@ -1042,8 +1042,9 @@ void w3m_exit(int i);
 #define AL_UNSET         0
 #define AL_EXPLICIT      1
 #define AL_IMPLICIT      2
-#define AL_IMPLICIT_DONE 3
-#define AL_IMPLICIT_ONCE 4
+#define AL_IMPLICIT_DONE 4
+#define AL_ONCE          8
+#define AL_IMPLICIT_ONCE (AL_IMPLICIT|AL_ONCE)
 #endif
 
 /* 
diff --git a/main.c b/main.c
index bb6d23b..5a0d083 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.121 2002/11/08 15:54:47 ukai Exp $ */
+/* $Id: main.c,v 1.122 2002/11/08 16:01:21 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -967,11 +967,11 @@ MAIN(int argc, char **argv, char **envp)
 	    mouse_active();
 #endif				/* USE_MOUSE */
 #ifdef USE_ALARM
-	if (alarm_status == AL_IMPLICIT) {
+	if (alarm_status & AL_IMPLICIT) {
 	    alarm_buffer = Currentbuf;
-	    alarm_status = AL_IMPLICIT_DONE;
+	    alarm_status = AL_IMPLICIT_DONE | (AL_IMPLICIT & AL_ONCE);
 	}
-	else if (alarm_status == AL_IMPLICIT_DONE
+	else if (alarm_status & AL_IMPLICIT_DONE
 		 && alarm_buffer != Currentbuf) {
 	    setAlarmEvent(0, AL_UNSET, FUNCNAME_nulcmd, NULL);
 	}
@@ -5217,13 +5217,12 @@ SigAlarm(SIGNAL_ARG)
 				      data ? data : "")->ptr,
 			      FALSE, alarm_sec - 1, FALSE, TRUE);
 	}
-	else if (alarm_status == AL_IMPLICIT) {
+	else if (alarm_status & AL_IMPLICIT) {
 	    alarm_buffer = Currentbuf;
-	    alarm_status = AL_IMPLICIT_DONE;
+	    alarm_status = AL_IMPLICIT_DONE | (AL_IMPLICIT & AL_ONCE);
 	}
-	else if ((alarm_status == AL_IMPLICIT_DONE
-		  && alarm_buffer != Currentbuf)
-		 || alarm_status == AL_IMPLICIT_ONCE) {
+	else if (alarm_status & AL_IMPLICIT_DONE
+		 && (alarm_buffer != Currentbuf || alarm_status & AL_ONCE)) {
 	    setAlarmEvent(0, AL_UNSET, FUNCNAME_nulcmd, NULL);
 	}
 	if (alarm_sec > 0) {
@@ -5270,8 +5269,7 @@ void
 setAlarmEvent(int sec, short status, int cmd, void *data)
 {
     if (status == AL_UNSET || status == AL_EXPLICIT
-	|| status == AL_IMPLICIT_ONCE
-	|| (status == AL_IMPLICIT && alarm_status != AL_EXPLICIT)) {
+	|| (status & AL_IMPLICIT && alarm_status != AL_EXPLICIT)) {
 	alarm_sec = sec;
 	alarm_status = status;
 	alarm_event.cmd = cmd;