summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-07 20:40:08 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-07 20:40:08 +0000
commit48d0ac775cb2da3b5aa9d46711ff17c50ce0f707 (patch)
tree91db60ad2417a9b6a3c1f3910a7e84559446c346
parent62a099cc6dbfc31c0ced3f6d895711208bf10518 (diff)
patch 8.2.4035: timer triggered at the debug prompt may cause troublev8.2.4035
Problem: Timer triggered at the debug prompt may cause trouble. Solution: Do not trigger any timer at the debug prompt. (closes #9481)
-rw-r--r--src/time.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/time.c b/src/time.c
index 001f2d8121..75e7b2546f 100644
--- a/src/time.c
+++ b/src/time.c
@@ -501,8 +501,9 @@ check_due_timer(void)
int need_update_screen = FALSE;
long current_id = last_timer_id;
- // Don't run any timers while exiting or dealing with an error.
- if (exiting || aborting())
+ // Don't run any timers while exiting, dealing with an error or at the
+ // debug prompt.
+ if (exiting || aborting() || debug_mode)
return next_due;
profile_start(&now);
diff --git a/src/version.c b/src/version.c
index e2b5023e35..44d849ef5b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4035,
+/**/
4034,
/**/
4033,