patch 7.4.1909

Problem:    Doubled semicolons.
Solution:   Reduce to one. (Dominique Pelle)

diff --git a/src/dosinst.c b/src/dosinst.c
index 809789fb7f0967cd1878cbe4aa833687ea2eacc7..2362418a6ba54894f0e8e850252bb0c7ddbbe7d0 100644 (file)
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -1313,14 +1313,14 @@ init_vimrc_choices(void)
     /* Whether to remap keys */
     alloc_text(choice_count, remap_text , remap_choices[remap_choice]);
     choices[choice_count].changefunc = change_remap_choice;
-    choices[choice_count].installfunc = NULL;;
+    choices[choice_count].installfunc = NULL;
     choices[choice_count].active = (*oldvimrc == NUL);
     ++choice_count;
 
     /* default way to use the mouse */
     alloc_text(choice_count, mouse_text, mouse_choices[mouse_choice]);
     choices[choice_count].changefunc = change_mouse_choice;
-    choices[choice_count].installfunc = NULL;;
+    choices[choice_count].installfunc = NULL;
     choices[choice_count].active = (*oldvimrc == NUL);
     ++choice_count;
 }

diff --git a/src/fold.c b/src/fold.c
index 8b9ca35ebf174fb21613f47df284aecf143bbc5b..e4c7f412e0d249fb25d4dfc734395c269573f226 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -153,7 +153,7 @@ hasFoldingWin(
     int                use_level = FALSE;
     int                maybe_small = FALSE;
     garray_T   *gap;
-    int                low_level = 0;;
+    int                low_level = 0;
 
     checkupdate(win);
     /*

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index cd115b8058d3fe081c658b6bc54fc7cd6904df56..620c89228358d9903c2e759d0b3dd983b568cfe2 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2205,7 +2205,7 @@ parse_uri_list(int *count, char_u *data, int len)
 {
     int            n       = 0;
     char_u  *tmp    = NULL;
-    char_u  **array = NULL;;
+    char_u  **array = NULL;
 
     if (data != NULL && len > 0 && (tmp = (char_u *)alloc(len + 1)) != NULL)
     {

diff --git a/src/gui_w32.c b/src/gui_w32.c
index f6601dff7c154a7093b2f986caeb35161e5a3246..cf29b610c3b4e2ce4b4852f22d4056453bec66ef 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -685,7 +685,7 @@ char_to_string(int ch, char_u *string, int slen, int had_alt)
     int                i;
 #ifdef FEAT_MBYTE
     WCHAR      wstring[2];
-    char_u     *ws = NULL;;
+    char_u     *ws = NULL;
 
     if (os_version.dwPlatformId != VER_PLATFORM_WIN32_NT)
     {
@@ -1873,7 +1873,7 @@ process_message(void)
                    && (vk != VK_SPACE || !(GetKeyState(VK_MENU) & 0x8000)))
            {
                /*
-                * Behave as exected if we have a dead key and the special key
+                * Behave as expected if we have a dead key and the special key
                 * is a key that would normally trigger the dead key nominal
                 * character output (such as a NUMPAD printable character or
                 * the TAB key, etc...).

diff --git a/src/main.c b/src/main.c
index ee375000327c376a39352b799ade95655da11028..c877800545080e6f7e2441faf9d283a9d00e4999 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -3159,7 +3159,7 @@ process_env(
        sourcing_name = save_sourcing_name;
        sourcing_lnum = save_sourcing_lnum;
 #ifdef FEAT_EVAL
-       current_SID = save_sid;;
+       current_SID = save_sid;
 #endif
        return OK;
     }

diff --git a/src/misc2.c b/src/misc2.c
index ae6ca048d910a1ea4415074ee4f9c9b1e3bb6668..67486aae346eeabf83a1323b6b77aed07318c954 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -5152,7 +5152,7 @@ ff_create_stack_element(
     new->ffs_filearray_cur  = 0;
     new->ffs_stage        = 0;
     new->ffs_level        = level;
-    new->ffs_star_star_empty = star_star_empty;;
+    new->ffs_star_star_empty = star_star_empty;
 
     /* the following saves NULL pointer checks in vim_findfile */
     if (fix_part == NULL)

diff --git a/src/version.c b/src/version.c
index f4f70d492e5ec09f584d082cef2bf85d0f0180a0..9aba54cb2c42d858b2616b3600c2196855a11382 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1909,
 /**/
     1908,
 /**/