# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1465414206 -7200
# Node ID c25898cc99c1cbf4210a67552ad9a4c37115e1c3
# Parent  fb1ca4d846d36386c5a946fb0f133d0bcdc4cd52
commit https://github.com/vim/vim/commit/945ec093cd4ddefab930239990564b12eb232153
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jun 8 21:17:43 2016 +0200

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

diff --git a/src/dosinst.c b/src/dosinst.c
--- 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
--- 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
--- 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	    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
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -685,7 +685,7 @@ char_to_string(int ch, char_u *string, i
     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
--- 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
--- 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
--- 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 */
 /**/
+    1909,
+/**/
     1908,
 /**/
     1907,