To: vim_dev@googlegroups.com Subject: Patch 7.4.1909 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1909 Problem: Doubled semicolons. Solution: Reduce to one. (Dominique Pelle) Files: src/dosinst.c, src/fold.c, src/gui_gtk_x11.c, src/gui_w32.c, src/main.c, src/misc2.c *** ../vim-7.4.1908/src/dosinst.c 2016-03-28 23:05:42.962064595 +0200 --- src/dosinst.c 2016-06-08 21:15:29.089195346 +0200 *************** *** 1313,1326 **** /* 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].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].active = (*oldvimrc == NUL); ++choice_count; } --- 1313,1326 ---- /* 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].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].active = (*oldvimrc == NUL); ++choice_count; } *** ../vim-7.4.1908/src/fold.c 2016-04-14 16:22:01.161150961 +0200 --- src/fold.c 2016-06-08 21:15:29.093195346 +0200 *************** *** 153,159 **** int use_level = FALSE; int maybe_small = FALSE; garray_T *gap; ! int low_level = 0;; checkupdate(win); /* --- 153,159 ---- int use_level = FALSE; int maybe_small = FALSE; garray_T *gap; ! int low_level = 0; checkupdate(win); /* *** ../vim-7.4.1908/src/gui_gtk_x11.c 2016-06-04 22:18:08.337897639 +0200 --- src/gui_gtk_x11.c 2016-06-08 21:15:29.097195346 +0200 *************** *** 2205,2211 **** { int n = 0; char_u *tmp = NULL; ! char_u **array = NULL;; if (data != NULL && len > 0 && (tmp = (char_u *)alloc(len + 1)) != NULL) { --- 2205,2211 ---- { int n = 0; char_u *tmp = NULL; ! char_u **array = NULL; if (data != NULL && len > 0 && (tmp = (char_u *)alloc(len + 1)) != NULL) { *** ../vim-7.4.1908/src/gui_w32.c 2016-06-04 22:36:14.081882703 +0200 --- src/gui_w32.c 2016-06-08 21:15:29.097195346 +0200 *************** *** 685,691 **** int i; #ifdef FEAT_MBYTE WCHAR wstring[2]; ! char_u *ws = NULL;; if (os_version.dwPlatformId != VER_PLATFORM_WIN32_NT) { --- 685,691 ---- int i; #ifdef FEAT_MBYTE WCHAR wstring[2]; ! char_u *ws = NULL; if (os_version.dwPlatformId != VER_PLATFORM_WIN32_NT) { *************** *** 1873,1879 **** && (vk != VK_SPACE || !(GetKeyState(VK_MENU) & 0x8000))) { /* ! * Behave as exected 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...). --- 1873,1879 ---- && (vk != VK_SPACE || !(GetKeyState(VK_MENU) & 0x8000))) { /* ! * 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...). *** ../vim-7.4.1908/src/main.c 2016-04-14 12:46:33.616678646 +0200 --- src/main.c 2016-06-08 21:15:29.097195346 +0200 *************** *** 3159,3165 **** sourcing_name = save_sourcing_name; sourcing_lnum = save_sourcing_lnum; #ifdef FEAT_EVAL ! current_SID = save_sid;; #endif return OK; } --- 3159,3165 ---- sourcing_name = save_sourcing_name; sourcing_lnum = save_sourcing_lnum; #ifdef FEAT_EVAL ! current_SID = save_sid; #endif return OK; } *** ../vim-7.4.1908/src/misc2.c 2016-06-01 23:08:35.245421504 +0200 --- src/misc2.c 2016-06-08 21:15:29.097195346 +0200 *************** *** 5152,5158 **** new->ffs_filearray_cur = 0; new->ffs_stage = 0; new->ffs_level = level; ! new->ffs_star_star_empty = star_star_empty;; /* the following saves NULL pointer checks in vim_findfile */ if (fix_part == NULL) --- 5152,5158 ---- new->ffs_filearray_cur = 0; new->ffs_stage = 0; new->ffs_level = level; ! new->ffs_star_star_empty = star_star_empty; /* the following saves NULL pointer checks in vim_findfile */ if (fix_part == NULL) *** ../vim-7.4.1908/src/version.c 2016-06-08 20:17:17.569243375 +0200 --- src/version.c 2016-06-08 21:16:20.169194643 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1909, /**/ -- hundred-and-one symptoms of being an internet addict: 70. ISDN lines are added to your house on a hourly basis /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///