patch 8.2.4476: operator name spelled wrong

Problem:    Operator name spelled wrong.
Solution:   Change trinary to ternary. (Goc Dundar, closes #9850)

diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index 7a998bc3072e4ede917953fd89c7f804e437e5c5..40c1701df76a7ff73001a61d52e9d5d4dc40559a 100644 (file)
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -43,7 +43,7 @@ func Test_version()
   call assert_false(has('patch-9.9.1'))
 endfunc
 
-func Test_op_trinary()
+func Test_op_ternary()
   let lines =<< trim END
       call assert_equal('yes', 1 ? 'yes' : 'no')
       call assert_equal('no', 0 ? 'yes' : 'no')

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index c4e520bed8f88e8d0f4853e5af88b3c45b26b8ad..f9cb62cb0e0798ffb7c7eda8c3362668b253cb07 100644 (file)
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -12,7 +12,7 @@ def FuncTwo(arg: number): number
 enddef
 
 " test cond ? expr : expr
-def Test_expr1_trinary()
+def Test_expr1_ternary()
   var lines =<< trim END
       assert_equal('one', true ? 'one' : 'two')
       assert_equal('one', 1 ?
@@ -74,7 +74,7 @@ def Test_expr1_trinary()
   v9.CheckDefAndScriptFailure(lines, ['E1001: Variable not found: FuncOne', 'E121: Undefined variable: FuncTwo'])
 enddef
 
-def Test_expr1_trinary_vimscript()
+def Test_expr1_ternary_vimscript()
   # check line continuation
   var lines =<< trim END
       var name = 1
@@ -170,7 +170,7 @@ def Test_expr1_trinary_vimscript()
   v9.CheckDefAndScriptSuccess(lines)
 enddef
 
-func Test_expr1_trinary_fails()
+func Test_expr1_ternary_fails()
   call v9.CheckDefAndScriptFailure(["var x = 1 ? 'one'"], "Missing ':' after '?'", 1)
 
   let msg = "White space required before and after '?'"

diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index 3cd42d01c27037669a2d0ab453be9ab6178e40c0..f497498ba930daa8a201a0ad7daf1d17ab1c78b0 100644 (file)
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -7475,7 +7475,7 @@ func Test_typed_script_var()
 endfunc
 
 " Test for issue6776              {{{1
-func Test_trinary_expression()
+func Test_ternary_expression()
   try
     call eval('0 ? 0')
   catch

diff --git a/src/version.c b/src/version.c
index 8842ecca8da9f549b6ef891ccb22bf5924e48722..2fa8e72f134773b66b363a7f80317a6c4222cf82 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4476,
 /**/
     4475,
 /**/