diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-08 21:17:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-08 21:17:43 +0200 |
| commit | 945ec093cd4ddefab930239990564b12eb232153 (patch) | |
| tree | f0bbaf6b699d1d3e758e6b3a395413ef64d00742 | |
| parent | 5ce4a0b96ab688b1ea2481c2516e2889ff6713bf (diff) | |
| download | vim-git-945ec093cd4ddefab930239990564b12eb232153.tar.gz | |
patch 7.4.1909v7.4.1909
Problem: Doubled semicolons.
Solution: Reduce to one. (Dominique Pelle)
| -rw-r--r-- | src/dosinst.c | 4 | ||||
| -rw-r--r-- | src/fold.c | 2 | ||||
| -rw-r--r-- | src/gui_gtk_x11.c | 2 | ||||
| -rw-r--r-- | src/gui_w32.c | 4 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/misc2.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
7 files changed, 10 insertions, 8 deletions
diff --git a/src/dosinst.c b/src/dosinst.c index 809789fb7..2362418a6 100644 --- 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 8b9ca35eb..e4c7f412e 100644 --- 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 cd115b805..620c89228 100644 --- 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 f6601dff7..cf29b610c 100644 --- 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 ee3750003..c87780054 100644 --- 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 ae6ca048d..67486aae3 100644 --- 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 f4f70d492..9aba54cb2 100644 --- 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, |