• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Révision1fc0421a448f1fd54aef4c193cba505fe2ff83bb (tree)
l'heure2022-01-16 00:30:02
AuteurBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Message de Log

patch 8.2.4098: typing "interrupt" at debug prompt may keep exception around

Commit: https://github.com/vim/vim/commit/069613c9e8645acea3a128c15ebdbf56e2219d44
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 15 15:23:44 2022 +0000

patch 8.2.4098: typing "interrupt" at debug prompt may keep exception around
Problem: Typing "interrupt" at debug prompt may keep exception around,
causing function calls to fail.
Solution: Discard any exception at the toplevel. (closes #9532)

Change Summary

Modification

diff -r 4f8fc83ffa7e -r 1fc0421a448f src/main.c
--- a/src/main.c Sat Jan 15 15:30:04 2022 +0100
+++ b/src/main.c Sat Jan 15 16:30:02 2022 +0100
@@ -1246,6 +1246,13 @@
12461246 else
12471247 previous_got_int = FALSE;
12481248
1249+#ifdef FEAT_EVAL
1250+ // At the toplevel there is no exception handling. Discard any that
1251+ // may be hanging around (e.g. from "interrupt" at the debug prompt).
1252+ if (did_throw && !ex_normal_busy)
1253+ discard_current_exception();
1254+#endif
1255+
12491256 if (!exmode_active)
12501257 msg_scroll = FALSE;
12511258 quit_more = FALSE;
diff -r 4f8fc83ffa7e -r 1fc0421a448f src/version.c
--- a/src/version.c Sat Jan 15 15:30:04 2022 +0100
+++ b/src/version.c Sat Jan 15 16:30:02 2022 +0100
@@ -751,6 +751,8 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 4098,
755+/**/
754756 4097,
755757 /**/
756758 4096,
Afficher sur ancien navigateur de dépôt.