From 2380747ff2ea7bb801b7e92cbe30832fa75cb622 Mon Sep 17 00:00:00 2001
From: Shougo <Shougo.Matsu@gmail.com>
Date: Sat, 10 Dec 2016 21:40:29 +0900
Subject: vim-patch:7.4.1909 (#5748)

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

https://github.com/vim/vim/commit/945ec093cd4ddefab930239990564b12eb232153
---
 src/nvim/file_search.c | 2 +-
 src/nvim/fold.c        | 2 +-
 src/nvim/main.c        | 2 +-
 src/nvim/version.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index c6cfba8142..2ac8e27047 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -1149,7 +1149,7 @@ static ff_stack_T *ff_create_stack_element(char_u *fix_part, char_u *wc_part, in
   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/nvim/fold.c b/src/nvim/fold.c
index c84d738cb4..dcd32acfb7 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -165,7 +165,7 @@ bool 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/nvim/main.c b/src/nvim/main.c
index 12227565f3..c7a60d07c1 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1763,7 +1763,7 @@ static int process_env(char *env, bool is_viminit)
     do_cmdline_cmd((char *)initstr);
     sourcing_name = save_sourcing_name;
     sourcing_lnum = save_sourcing_lnum;
-    current_SID = save_sid;;
+    current_SID = save_sid;
     return OK;
   }
   return FAIL;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index cbb0ae5112..7e7080fd61 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -531,7 +531,7 @@ static int included_patches[] = {
   // 1912,
   // 1911,
   // 1910,
-  // 1909,
+  1909,
   // 1908 NA
   // 1907,
   // 1906 NA
-- 
cgit