aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

patch 7.4.1909

Browse Source 
Problem:    Doubled semicolons.
Solution:   Reduce to one. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2016-06-08 21:17:43 +02:00
parent 5ce4a0b96a
commit 945ec093cd
7 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dosinst.c
View File

@@ -1313,14 +1313,14 @@ init_vimrc_choices(void)
/* Whether to remap keys */ /* Whether to remap keys */
alloc_text(choice_count, remap_text , remap_choices[remap_choice]); alloc_text(choice_count, remap_text , remap_choices[remap_choice]);
choices[choice_count].changefunc = change_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); choices[choice_count].active = (*oldvimrc == NUL);
++choice_count; ++choice_count;
/* default way to use the mouse */ /* default way to use the mouse */
alloc_text(choice_count, mouse_text, mouse_choices[mouse_choice]); alloc_text(choice_count, mouse_text, mouse_choices[mouse_choice]);
choices[choice_count].changefunc = change_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); choices[choice_count].active = (*oldvimrc == NUL);
++choice_count; ++choice_count;
} }

2
src/fold.c
View File

@@ -153,7 +153,7 @@ hasFoldingWin(
int use_level = FALSE; int use_level = FALSE;
int maybe_small = FALSE; int maybe_small = FALSE;
garray_T *gap; garray_T *gap;
int low_level = 0;; int low_level = 0;
checkupdate(win); checkupdate(win);
/* /*

2
src/gui_gtk_x11.c
View File

@@ -2205,7 +2205,7 @@ parse_uri_list(int *count, char_u *data, int len)
{ {
int n = 0; int n = 0;
char_u *tmp = NULL; char_u *tmp = NULL;
char_u **array = NULL;; char_u **array = NULL;
if (data != NULL && len > 0 && (tmp = (char_u *)alloc(len + 1)) != NULL) if (data != NULL && len > 0 && (tmp = (char_u *)alloc(len + 1)) != NULL)
{ {

4
src/gui_w32.c
View File

@@ -685,7 +685,7 @@ char_to_string(int ch, char_u *string, int slen, int had_alt)
int i; int i;
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
WCHAR wstring[2]; WCHAR wstring[2];
char_u *ws = NULL;; char_u *ws = NULL;
if (os_version.dwPlatformId != VER_PLATFORM_WIN32_NT) if (os_version.dwPlatformId != VER_PLATFORM_WIN32_NT)
{ {
@@ -1873,7 +1873,7 @@ process_message(void)
&& (vk != VK_SPACE || !(GetKeyState(VK_MENU) & 0x8000))) && (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 * is a key that would normally trigger the dead key nominal
* character output (such as a NUMPAD printable character or * character output (such as a NUMPAD printable character or
* the TAB key, etc...). * the TAB key, etc...).

2
src/main.c
View File

@@ -3159,7 +3159,7 @@ process_env(
sourcing_name = save_sourcing_name; sourcing_name = save_sourcing_name;
sourcing_lnum = save_sourcing_lnum; sourcing_lnum = save_sourcing_lnum;
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
current_SID = save_sid;; current_SID = save_sid;
#endif #endif
return OK; return OK;
} }

2
src/misc2.c
View File

@@ -5152,7 +5152,7 @@ ff_create_stack_element(
new->ffs_filearray_cur = 0; new->ffs_filearray_cur = 0;
new->ffs_stage = 0; new->ffs_stage = 0;
new->ffs_level = level; 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 */ /* the following saves NULL pointer checks in vim_findfile */
if (fix_part == NULL) if (fix_part == NULL)

2
src/version.c
View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1909,
/**/ /**/
1908, 1908,
/**/ /**/