summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2019-06-21 11:26:10 -0600
committerEduardo Chappa <chappa@washington.edu>2019-06-21 11:26:10 -0600
commitd5f1993e53b19b2b7dedebf14c70696c9651e35b (patch)
tree722de61a8cd4184d8184f61271a5aebbf4c0893d
parent5a4481cdd645334158217a1072564837bf09b28b (diff)
downloadalpine-d5f1993e53b19b2b7dedebf14c70696c9651e35b.tar.xz
* Do not use a delay when printing messages to screen when the initial
keystroke sequence of commands is active. Based on a report from Holger Trapp.
-rw-r--r--alpine/osdep/termin.gen.c2
-rw-r--r--alpine/status.c7
-rw-r--r--pith/pine.hlp6
3 files changed, 10 insertions, 5 deletions
diff --git a/alpine/osdep/termin.gen.c b/alpine/osdep/termin.gen.c
index fec3db20..d34fc70c 100644
--- a/alpine/osdep/termin.gen.c
+++ b/alpine/osdep/termin.gen.c
@@ -1155,7 +1155,7 @@ process_config_input(UCS *ch)
}
}
- if(!*ps_global->initial_cmds && ps_global->free_initial_cmds){
+ if(ps_global->initial_cmds && !*ps_global->initial_cmds && ps_global->free_initial_cmds){
fs_give((void **) &ps_global->free_initial_cmds);
ps_global->initial_cmds = NULL;
}
diff --git a/alpine/status.c b/alpine/status.c
index ffdbf95e..42d03782 100644
--- a/alpine/status.c
+++ b/alpine/status.c
@@ -235,7 +235,7 @@ pause_for_and_dq_cur_msg(void)
* values for w. In those cases, reset w.
*/
w = (w > 0 ? (w > 5 ? 5 : w) : 0);
- sleep(w);
+ if(ps_global && !ps_global->initial_cmds) sleep(w);
delay_cmd_cue(0);
}
@@ -258,7 +258,7 @@ pause_for_and_mark_specific_msg(SMQ_T *msg)
w = (w > 0) ? (w > 5 ? 5 : w): 0;
if(w){
delay_cmd_cue(1);
- sleep(w);
+ if (ps_global && !ps_global->initial_cmds) sleep(w);
delay_cmd_cue(0);
}
@@ -1066,7 +1066,8 @@ output_message(SMQ_T *mq_entry, int ding)
MoveCursor(ps_global->ttyo->screen_rows-FOOTER_ROWS(ps_global), 0);
fflush(stdout);
- sleep(ps_global->status_msg_delay);
+ if (ps_global && !ps_global->initial_cmds)
+ sleep(ps_global->status_msg_delay);
}
mq_entry->shown = 1;
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 9494a1d0..59f746be 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 350 2019-06-05 12:46:29
+Alpine Commit 351 2019-06-21 11:25:44
============= h_news =================
<HTML>
<HEAD>
@@ -238,6 +238,10 @@ submitted in 2009, but resubmitted by Erich Eckner on 2019.
user agrees to save a certificate of another user, use the saved
certificate immediately to verify the smime message. Reported by
Stefan Mueller.
+
+<LI> Do not use a delay when printing messages to screen when the initial
+ keystroke sequence of commands is active. Based on a report from Holger
+ Trapp.
</UL>
<P>