commit 271978188f87f92e15b723a191d11440e4103005
parent 4c5a173f365807f7c9959082fd34c09ac2d885b2
Author: ukai <ukai>
Date: Thu, 14 Nov 2002 17:01:25 +0000
[w3m-dev 03430] disable display of alarm command
* main.c (SigAlarm): remove display_message_nsec()
(setAlarm): show sec
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-15 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03430] disable display of alarm command
+ * main.c (SigAlarm): remove display_message_nsec()
+ (setAlarm): show sec
+
2002-11-15 Fumitoshi UKAI <ukai@debian.or.jp>
* NEWS: env,rc: https_proxy
diff --git a/main.c b/main.c
@@ -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);