To: vim_dev@googlegroups.com Subject: Patch 9.0.0838 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0838 Problem: Compiler warnings for unused variables. Solution: Addjust #ifdef and remove unused variables. (John Marriott) Files: src/gui.c, src/gui_w32.c, src/os_win32.c *** ../vim-9.0.0837/src/gui.c 2022-10-04 16:23:39.014042183 +0100 --- src/gui.c 2022-11-06 11:21:17.358672608 +0000 *************** *** 64,70 **** --- 64,72 ---- gui_start(char_u *arg UNUSED) { char_u *old_term; + #ifdef GUI_MAY_FORK static int recursive = 0; + #endif #if defined(GUI_MAY_SPAWN) && defined(EXPERIMENTAL_GUI_CMD) char *msg = NULL; #endif *************** *** 76,84 **** cursor_on(); // needed for ":gui" in .vimrc full_screen = FALSE; - ++recursive; - #ifdef GUI_MAY_FORK /* * Quit the current process and continue in the child. * Makes "gvim file" disconnect from the shell it was started in. --- 78,85 ---- cursor_on(); // needed for ":gui" in .vimrc full_screen = FALSE; #ifdef GUI_MAY_FORK + ++recursive; /* * Quit the current process and continue in the child. * Makes "gvim file" disconnect from the shell it was started in. *************** *** 153,159 **** --- 154,162 ---- gui_mch_update(); apply_autocmds(gui.in_use ? EVENT_GUIENTER : EVENT_GUIFAILED, NULL, NULL, FALSE, curbuf); + #ifdef GUI_MAY_FORK --recursive; + #endif } /* *** ../vim-9.0.0837/src/gui_w32.c 2022-11-02 13:30:37.534314540 +0000 --- src/gui_w32.c 2022-11-06 11:22:28.050644143 +0000 *************** *** 6190,6202 **** // handled here. int i; int wlen; // string length in words - int clen; // string length in characters int cells; // cell width of string up to composing char int cw; // width of current cell int c; wlen = 0; - clen = 0; cells = 0; for (i = 0; i < len; ) { --- 6190,6200 ---- *************** *** 6236,6242 **** } cells += cw; i += utf_ptr2len_len(text + i, len - i); - ++clen; } #if defined(FEAT_DIRECTX) if (IS_ENABLE_DIRECTX()) --- 6234,6239 ---- *** ../vim-9.0.0837/src/os_win32.c 2022-11-02 13:30:37.538314551 +0000 --- src/os_win32.c 2022-11-06 11:24:41.906606308 +0000 *************** *** 4394,4400 **** int ret; DWORD len; DWORD toRead; - int repeatCount; // we query the pipe to see if there is any data to read // to avoid to perform a blocking read --- 4394,4399 ---- *************** *** 4405,4415 **** &availableBytes, // available bytes total NULL); // byteLeft - repeatCount = 0; // We got real data in the pipe, read it while (ret != 0 && availableBytes > 0) { - repeatCount++; toRead = (DWORD)(BUFLEN - *buffer_off); toRead = availableBytes < toRead ? availableBytes : toRead; ReadFile(g_hChildStd_OUT_Rd, buffer + *buffer_off, toRead , &len, NULL); --- 4404,4412 ---- *** ../vim-9.0.0837/src/version.c 2022-11-05 23:46:30.720146269 +0000 --- src/version.c 2022-11-06 11:22:55.078634919 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 838, /**/ -- How To Keep A Healthy Level Of Insanity: 2. Page yourself over the intercom. Don't disguise your voice. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///