aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-11-08 17:32:50 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-11-08 17:32:50 +0000
commitf5c7af1d39b485fbf9e79a468a069611819561cf (patch)
tree45e7cb33de9a9ea3d6fcddcc183027e397086e0e
parentfix indent (diff)
downloadw3m-f5c7af1d39b485fbf9e79a468a069611819561cf.tar.gz
w3m-f5c7af1d39b485fbf9e79a468a069611819561cf.zip
[w3m-dev 03396] Re: meta refresh problem
* main.c (MAIN): AL_IMPLICIT -> alarm_status (SigAlarm): AL_IMPLICIT -> alarm_status From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
-rw-r--r--ChangeLog8
-rw-r--r--main.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e0e0ba6..a98e144 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+ * [w3m-dev 03396] Re: meta refresh problem
+ * main.c (MAIN): AL_IMPLICIT -> alarm_status
+ (SigAlarm): AL_IMPLICIT -> alarm_status
+
+2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
* [w3m-dev 03391] use editor when input at last line
* linein.c (_editor): added
@@ -4440,4 +4446,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.489 2002/11/08 16:09:58 ukai Exp $
+$Id: ChangeLog,v 1.490 2002/11/08 17:32:50 ukai Exp $
diff --git a/main.c b/main.c
index d6d24d4..ec0dfe8 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.124 2002/11/08 16:11:49 ukai Exp $ */
+/* $Id: main.c,v 1.125 2002/11/08 17:32:52 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -969,7 +969,7 @@ MAIN(int argc, char **argv, char **envp)
#ifdef USE_ALARM
if (alarm_status & AL_IMPLICIT) {
alarm_buffer = Currentbuf;
- alarm_status = AL_IMPLICIT_DONE | (AL_IMPLICIT & AL_ONCE);
+ alarm_status = AL_IMPLICIT_DONE | (alarm_status & AL_ONCE);
}
else if (alarm_status & AL_IMPLICIT_DONE && alarm_buffer != Currentbuf) {
setAlarmEvent(0, AL_UNSET, FUNCNAME_nulcmd, NULL);
@@ -5219,7 +5219,7 @@ SigAlarm(SIGNAL_ARG)
}
else if (alarm_status & AL_IMPLICIT) {
alarm_buffer = Currentbuf;
- alarm_status = AL_IMPLICIT_DONE | (AL_IMPLICIT & AL_ONCE);
+ alarm_status = AL_IMPLICIT_DONE | (alarm_status & AL_ONCE);
}
else if (alarm_status & AL_IMPLICIT_DONE
&& (alarm_buffer != Currentbuf || alarm_status & AL_ONCE)) {