patch 9.2.0011: A few double semicolons after statement

chrisbra · chrisbra · commit 0e57151c1831 · 2026-02-16T21:32:29.000Z
Problem:  A few double semicolons after statement
Solution: Remove those, add a codestyle test

Signed-off-by: Christian Brabandt &lt;cb@256bit.org&gt;
diff --git a/src/clipboard.c b/src/clipboard.c
@@ -2965,7 +2965,7 @@ clip_wl_receive_data(Clipboard_T *cbd, const char *mime_type, int fd)
 
     if (STRCMP(mime_type, VIM_ATOM_NAME) == 0 && buf.ga_len >= 2)
     {
-	motion_type = *final++;;
+	motion_type = *final++;
 	buf.ga_len--;
     }
     else if (STRCMP(mime_type, VIMENC_ATOM_NAME) == 0 && buf.ga_len >= 3)
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
@@ -6947,7 +6947,7 @@ gui_gtk_surface_copy_rect(int dest_x, int dest_y,
 		    dest_y - src_y);
 	    cairo_rectangle(cr, dest_x, dest_y, width, height);
 	    cairo_clip(cr);
-	    cairo_paint(cr);;
+	    cairo_paint(cr);
 	}
 	else
 	{
diff --git a/src/insexpand.c b/src/insexpand.c
@@ -4589,7 +4589,7 @@ get_next_filename_completion(void)
     int		i;
     int		score;
     char_u	*leader = ins_compl_leader();
-    size_t	leader_len = ins_compl_leader_len();;
+    size_t	leader_len = ins_compl_leader_len();
     int		in_fuzzy_collect = (cot_fuzzy() && leader_len > 0);
     int		*fuzzy_indices_data;
     char_u	*last_sep = NULL;
diff --git a/src/testdir/test_codestyle.vim b/src/testdir/test_codestyle.vim
@@ -43,6 +43,8 @@ def Test_source_files()
 
     PerformCheck(fname, '\s$', 'trailing white space', '')
 
+    PerformCheck(fname, ';;\+$', 'double semicolon', '')
+
     # some files don't stick to the Vim style rules
     if fname =~ 'iscygpty.c'
       continue
diff --git a/src/version.c b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    11,
 /**/
     10,
 /**/
diff --git a/src/viminfo.c b/src/viminfo.c
@@ -1891,7 +1891,7 @@ write_viminfo_registers(FILE *fp)
     int		max_kbyte;
     long	len;
     yankreg_T	*y_ptr;
-    yankreg_T	*y_regs_p = get_y_regs();;
+    yankreg_T	*y_regs_p = get_y_regs();
 
     fputs(_("\n# Registers:\n"), fp);
 

Original file line number	Diff line number	Diff line change
`@@ -2965,7 +2965,7 @@ clip_wl_receive_data(Clipboard_T cbd, const char mime_type, int fd)`
`2965`	`2965`
`2966`	`2966`	`if (STRCMP(mime_type, VIM_ATOM_NAME) == 0 && buf.ga_len >= 2)`
`2967`	`2967`	`{`
`2968`		`- motion_type = *final++;;`
	`2968`	`+ motion_type = *final++;`
`2969`	`2969`	`buf.ga_len--;`
`2970`	`2970`	`}`
`2971`	`2971`	`else if (STRCMP(mime_type, VIMENC_ATOM_NAME) == 0 && buf.ga_len >= 3)`
Original file line number	Diff line number	Diff line change
`@@ -6947,7 +6947,7 @@ gui_gtk_surface_copy_rect(int dest_x, int dest_y,`
`6947`	`6947`	`dest_y - src_y);`
`6948`	`6948`	`cairo_rectangle(cr, dest_x, dest_y, width, height);`
`6949`	`6949`	`cairo_clip(cr);`
`6950`		`- cairo_paint(cr);;`
	`6950`	`+ cairo_paint(cr);`
`6951`	`6951`	`}`
`6952`	`6952`	`else`
`6953`	`6953`	`{`