summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-07-31 22:17:28 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-31 22:17:28 +0200
commit9e0ee590197d74f94b7127bf0e033e4f83cf3762 (patch)
tree2b1bbcafd53dcaee18fdbd5f3287e693f8bc08f0
parent1780f08ba42837b6d4a5f0451117a79b2d49974a (diff)
downloadvim-git-9e0ee590197d74f94b7127bf0e033e4f83cf3762.tar.gz
patch 8.2.3262: build failure when ABORT_ON_INTERNAL_ERROR is definedv8.2.3262
Problem: Build failure when ABORT_ON_INTERNAL_ERROR is defined. Solution: Adjust how estack_len_before is used.
-rw-r--r--src/ex_docmd.c3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 773a6bec9..c72e9c1b7 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -664,8 +664,6 @@ do_cmdline(
#endif
static int call_depth = 0; // recursiveness
#ifdef FEAT_EVAL
- ESTACK_CHECK_DECLARATION
-
// For every pair of do_cmdline()/do_one_cmd() calls, use an extra memory
// location for storing error messages to be converted to an exception.
// This ensures that the do_errthrow() call in do_one_cmd() does not
@@ -1397,6 +1395,7 @@ handle_did_throw()
{
char *p = NULL;
msglist_T *messages = NULL;
+ ESTACK_CHECK_DECLARATION
/*
* If the uncaught exception is a user exception, report it as an
diff --git a/src/version.c b/src/version.c
index e3a6cb518..fcfd211cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3262,
+/**/
3261,
/**/
3260,