Mercurial > vim

diff src/strings.c @ 32381:8b7ba5c63996 v9.0.1522

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1522: some functions give two error messages Commit: https://github.com/vim/vim/commit/e4098457ab9c94225b1b0e3c5e06b82b75587971 Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 7 18:53:49 2023 +0100 patch 9.0.1522: some functions give two error messages Problem: Some functions give two error messages. Solution: Do not give a second error message. (closes https://github.com/vim/vim/issues/12352)
author Bram Moolenaar <Bram@vim.org>
date Sun, 07 May 2023 20:00:03 +0200
parents d5e673b941cd
children 49a13ac4a1b1
line wrap: on
line diff
--- a/src/strings.c
+++ b/src/strings.c
@@ -1044,8 +1044,11 @@ string_reduce(
 	remove_funccal();
 }
 
+/*
+ * Implementation of "byteidx()" and "byteidxcomp()" functions
+ */
     static void
-byteidx(typval_T *argvars, typval_T *rettv, int comp UNUSED)
+byteidx_common(typval_T *argvars, typval_T *rettv, int comp UNUSED)
 {
     rettv->vval.v_number = -1;
 
@@ -1065,7 +1068,8 @@ byteidx(typval_T *argvars, typval_T *ret
 	utf16idx = tv_get_bool(&argvars[2]);
 	if (utf16idx < 0 || utf16idx > 1)
 	{
-	    semsg(_(e_using_number_as_bool_nr), utf16idx);
+	    if (utf16idx != -1)
+		semsg(_(e_using_number_as_bool_nr), utf16idx);
 	    return;
 	}
     }
@@ -1100,7 +1104,7 @@ byteidx(typval_T *argvars, typval_T *ret
     void
 f_byteidx(typval_T *argvars, typval_T *rettv)
 {
-    byteidx(argvars, rettv, FALSE);
+    byteidx_common(argvars, rettv, FALSE);
 }
 
 /*
@@ -1109,7 +1113,7 @@ f_byteidx(typval_T *argvars, typval_T *r
     void
 f_byteidxcomp(typval_T *argvars, typval_T *rettv)
 {
-    byteidx(argvars, rettv, TRUE);
+    byteidx_common(argvars, rettv, TRUE);
 }
 
 /*
@@ -1419,7 +1423,10 @@ f_strchars(typval_T *argvars, typval_T *
     if (argvars[1].v_type != VAR_UNKNOWN)
 	skipcc = tv_get_bool(&argvars[1]);
     if (skipcc < 0 || skipcc > 1)
-	semsg(_(e_using_number_as_bool_nr), skipcc);
+    {
+	if (skipcc != -1)
+	    semsg(_(e_using_number_as_bool_nr), skipcc);
+    }
     else
 	strchar_common(argvars, rettv, skipcc);
 }
@@ -1529,7 +1536,8 @@ f_strcharpart(typval_T *argvars, typval_
 	    skipcc = tv_get_bool(&argvars[3]);
 	    if (skipcc < 0 || skipcc > 1)
 	    {
-		semsg(_(e_using_number_as_bool_nr), skipcc);
+		if (skipcc != -1)
+		    semsg(_(e_using_number_as_bool_nr), skipcc);
 		return;
 	    }
 	}