OSDN > Trouver un logiciel > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

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

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)

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 @@
1246	1246	else
1247	1247	previous_got_int = FALSE;
1248	1248
	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	+
1249	1256	if (!exmode_active)
1250	1257	msg_scroll = FALSE;
1251	1258	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 @@
751	751	static int included_patches[] =
752	752	{ /* Add new patch number below this line */
753	753	/**/
	754	+ 4098,
	755	+/**/
754	756	4097,
755	757	/**/
756	758	4096,