From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 21 Jan 2021 12:03:20 +0000 (+0100)
Subject: patch 8.2.2382: build failure
X-Git-Tag: v8.2.2382
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1f2857096aabe9a11e576005d08fc4e53781698;p=thirdparty%2Fvim.git

patch 8.2.2382: build failure

Problem:    Build failure.
Solution:   Add missing changes.
---

diff --git a/src/version.c b/src/version.c
index c220a409ec..2b6f6a88e3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2382,
 /**/
     2381,
 /**/
diff --git a/src/vim9execute.c b/src/vim9execute.c
index b1bc282636..59a0982b3f 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2951,17 +2951,19 @@ call_def_function(
 		    else
 #endif
 		    {
+			int failed = FALSE;
+
 			switch (iptr->isn_arg.op.op_type)
 			{
 			    case EXPR_MULT: n1 = n1 * n2; break;
-			    case EXPR_DIV:  n1 = num_divide(n1, n2);
-					    if (n2 == 0)
+			    case EXPR_DIV:  n1 = num_divide(n1, n2, &failed);
+					    if (failed)
 						goto on_error;
 					    break;
 			    case EXPR_SUB:  n1 = n1 - n2; break;
 			    case EXPR_ADD:  n1 = n1 + n2; break;
-			    default:	    n1 = num_modulus(n1, n2);
-					    if (n2 == 0)
+			    default:	    n1 = num_modulus(n1, n2, &failed);
+					    if (failed)
 						goto on_error;
 					    break;
 			}