patch 9.2.0011: A few double semicolons after statement

Problem:  A few double semicolons after statement
Solution: Remove those, add a codestyle test

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/clipboard.c b/src/clipboard.c
index 93be7b759079a0633615ee97f9a48b6a0b49e621..e0e2256d0d3ccaeac0149cdb1468d6dff0bc3840 100644 (file)
--- 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
index edf6b705d5ef4b7413bee50c5b4254b0d3f1d34d..bfe65c053dd562f6508a26fdd0f41b1a28f87766 100644 (file)
--- 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
index d6b600ca577c040858fac759eab5faefd4318abb..2117427cf3b29438fb0c4afab97e144164b1b1a7 100644 (file)
--- 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
index 46f839c0690b19a585838b3507a81b48f0191fcd..ed68e3510e178439e1a7e244c05401432508e3d4 100644 (file)
--- 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
index ad4b50cf771e0a415d582ef0a796d817cfb1a460..c60bce46b03b82386de279ff6d8a801e9936ceaf 100644 (file)
--- 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
index 893195bb3c8630d509f3cdd5cec63313ec7543d3..ddd1fe792c9e265df456f3b1689ab626788d5686 100644 (file)
--- 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);