Patch 8.2.5069
Problem: Various warnings from clang on MS-Windows.
Solution: Fix the code to avoid the warnings. (Yegappan Lakshmanan,
closes #10538)
Files: src/dosinst.c, src/fileio.c, src/gui_w32.c, src/os_mswin.c,
src/os_win32.c
*** ../vim-8.2.5068/src/dosinst.c 2022-02-25 17:37:47.624268999 +0000
--- src/dosinst.c 2022-06-08 15:08:03.076127491 +0100
***************
*** 211,218 ****
{
printf("ERROR: Cannot find filetype.vim in \"%s\"\n", installdir);
printf("It looks like you did not unpack the runtime archive.\n");
! printf("You must unpack the runtime archive \"vim%srt.zip\" before installing.\n",
! VIM_VERSION_NODOT + 3);
myexit(1);
}
--- 211,218 ----
{
printf("ERROR: Cannot find filetype.vim in \"%s\"\n", installdir);
printf("It looks like you did not unpack the runtime archive.\n");
! printf("You must unpack the runtime archive \"%srt.zip\" before installing.\n",
! VIM_VERSION_NODOT);
myexit(1);
}
*** ../vim-8.2.5068/src/fileio.c 2022-05-09 20:09:19.286641426 +0100
--- src/fileio.c 2022-06-08 15:08:03.076127491 +0100
***************
*** 1631,1637 ****
* Do the conversion.
*/
dst = ptr;
- size = size;
while (size > 0)
{
found_bad = FALSE;
--- 1631,1636 ----
*** ../vim-8.2.5068/src/gui_w32.c 2022-05-10 20:54:42.036080435 +0100
--- src/gui_w32.c 2022-06-08 15:08:03.076127491 +0100
***************
*** 4153,4159 ****
{
int button;
win_T *wp;
! int modifiers, kbd_modifiers;
int zDelta = GET_WHEEL_DELTA_WPARAM(wParam);
POINT pt;
--- 4153,4160 ----
{
int button;
win_T *wp;
! int modifiers = 0;
! int kbd_modifiers;
int zDelta = GET_WHEEL_DELTA_WPARAM(wParam);
POINT pt;
***************
*** 4213,4219 ****
pt.y = GET_Y_LPARAM(lParam);
ScreenToClient(s_textArea, &pt);
! gui_send_mouse_event(button, pt.x, pt.y, FALSE, kbd_modifiers);
}
#ifdef USE_SYSMENU_FONT
--- 4214,4220 ----
pt.y = GET_Y_LPARAM(lParam);
ScreenToClient(s_textArea, &pt);
! gui_send_mouse_event(button, pt.x, pt.y, FALSE, modifiers);
}
#ifdef USE_SYSMENU_FONT
*** ../vim-8.2.5068/src/os_mswin.c 2022-05-12 20:35:32.327574779 +0100
--- src/os_mswin.c 2022-06-08 15:08:03.080127491 +0100
***************
*** 560,566 ****
&& idx < (int)rb->AppExecLinkReparseBuffer.StringCount
&& idx != 2; )
{
! if ((*p++ == L'\0'))
++idx;
}
--- 560,566 ----
&& idx < (int)rb->AppExecLinkReparseBuffer.StringCount
&& idx != 2; )
{
! if (*p++ == L'\0')
++idx;
}
*** ../vim-8.2.5068/src/os_win32.c 2022-06-05 16:55:50.698774344 +0100
--- src/os_win32.c 2022-06-08 15:08:03.080127491 +0100
***************
*** 3495,3501 ****
* the allocated memory.
*/
int
! mch_can_exe(char_u *name, char_u **path, int use_path)
{
return executable_exists((char *)name, path, TRUE, TRUE);
}
--- 3495,3501 ----
* the allocated memory.
*/
int
! mch_can_exe(char_u *name, char_u **path, int use_path UNUSED)
{
return executable_exists((char *)name, path, TRUE, TRUE);
}
***************
*** 8379,8385 ****
const int *
start_timeout(long msec)
{
- UINT interval = (UINT)msec;
BOOL ret;
timeout_flag = &timeout_flags[flag_idx];
--- 8379,8384 ----
*** ../vim-8.2.5068/src/version.c 2022-06-08 13:11:38.684806841 +0100
--- src/version.c 2022-06-08 15:12:38.868129499 +0100
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 5069,
/**/
--
ARTHUR: Charge!
[They all charge with swords drawn towards the RABBIT. A tremendous twenty
second fight with Peckinpahish shots and borrowing heavily also on the
Kung Fu and karate-type films ensues, in which some four KNIGHTS are
comprehensively killed.]
ARTHUR: Run away! Run away!
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Br...@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 ///