From ccd60ac7b7df48c9da63523b586c89b265253678 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Thu, 14 Nov 2002 17:01:25 +0000 Subject: [w3m-dev 03430] disable display of alarm command * main.c (SigAlarm): remove display_message_nsec() (setAlarm): show sec From: Hironori SAKAMOTO --- ChangeLog | 8 +++++++- main.c | 13 ++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f870ea..7b75389 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-11-15 Hironori SAKAMOTO + + * [w3m-dev 03430] disable display of alarm command + * main.c (SigAlarm): remove display_message_nsec() + (setAlarm): show sec + 2002-11-15 Fumitoshi UKAI * NEWS: env,rc: https_proxy @@ -4637,4 +4643,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.512 2002/11/14 16:58:28 ukai Exp $ +$Id: ChangeLog,v 1.513 2002/11/14 17:01:25 ukai Exp $ diff --git a/main.c b/main.c index 347d8c0..f09f190 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.130 2002/11/14 16:56:23 ukai Exp $ */ +/* $Id: main.c,v 1.131 2002/11/14 17:01:29 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include @@ -5230,12 +5230,7 @@ SigAlarm(SIGNAL_ARG) #endif CurrentCmdData = NULL; onA(); - if (alarm_status == AL_EXPLICIT) { - disp_message_nsec(Sprintf("%s %s", w3mFuncList[alarm_event.cmd].id, - data ? data : "")->ptr, - FALSE, alarm_sec - 1, FALSE, TRUE); - } - else if (alarm_status & AL_IMPLICIT) { + if (alarm_status & AL_IMPLICIT) { alarm_buffer = Currentbuf; alarm_status = AL_IMPLICIT_DONE | (alarm_status & AL_ONCE); } @@ -5274,8 +5269,8 @@ setAlarm(void) if (cmd >= 0) { data = getQWord(&data); setAlarmEvent(sec, AL_EXPLICIT, cmd, data); - disp_message_nsec(Sprintf("%s %s", w3mFuncList[cmd].id, data)->ptr, - FALSE, sec - 1, FALSE, TRUE); + disp_message_nsec(Sprintf("%dsec %s %s", sec, w3mFuncList[cmd].id, + data)->ptr, FALSE, 1, FALSE, TRUE); } else { setAlarmEvent(0, AL_UNSET, FUNCNAME_nulcmd, NULL); -- cgit v1.2.3