To: vim-dev@vim.org Subject: Patch 5.6.023 (extra) Fcc: outbox From: Bram Moolenaar ------------ Patch 5.6.023 (extra) Problem: Various warnings for the Ming compiler. Solution: Changes to avoid the warnings. (Bill McCarthy) Files: src/ex_cmds.c, src/gui_w32.c, src/os_w32exe.c, src/os_win32.c, src/syntax.c, src/vim.rc *** ../vim-5.6.22/src/ex_cmds.c Sat Mar 25 14:34:46 2000 --- src/ex_cmds.c Sat Mar 25 14:25:52 2000 *************** *** 723,729 **** int save_nwr; #endif #ifdef MSWIN ! int winstart; #endif #ifdef RISCOS int silent = FALSE; --- 723,729 ---- int save_nwr; #endif #ifdef MSWIN ! int winstart = FALSE; #endif #ifdef RISCOS int silent = FALSE; *** ../vim-5.6.22/src/gui_w32.c Mon Jan 24 13:09:40 2000 --- src/gui_w32.c Thu Jan 27 10:34:50 2000 *************** *** 34,89 **** #ifdef __MINGW32__ ! #define _cdecl ! ! #define IsMinimized(hwnd) IsIconic(hwnd) ! #define IsMaximized(hwnd) IsZoomed(hwnd) ! #define SelectFont(hdc, hfont) ((HFONT)SelectObject((hdc), (HGDIOBJ)(HFONT)(hfont))) ! #define GetStockBrush(i) ((HBRUSH)GetStockObject(i)) ! #define DeleteBrush(hbr) DeleteObject((HGDIOBJ)(HBRUSH)(hbr)) ! #define HANDLE_WM_RBUTTONDBLCLK(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_MBUTTONUP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_MBUTTONDBLCLK(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_LBUTTONDBLCLK(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_RBUTTONDOWN(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_MOUSEMOVE(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_RBUTTONUP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_MBUTTONDOWN(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_LBUTTONUP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_LBUTTONDOWN(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! #define HANDLE_WM_SYSCHAR(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) ! #define HANDLE_WM_ACTIVATEAPP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (BOOL)(wParam), (DWORD)(lParam)), 0L) ! #define HANDLE_WM_WINDOWPOSCHANGING(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (LPWINDOWPOS)(lParam)) ! #define HANDLE_WM_VSCROLL(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(lParam), (UINT)(LOWORD(wParam)), (int)(short)HIWORD(wParam)), 0L) ! #define HANDLE_WM_SETFOCUS(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(wParam)), 0L) ! #define HANDLE_WM_KILLFOCUS(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(wParam)), 0L) ! #define HANDLE_WM_HSCROLL(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(lParam), (UINT)(LOWORD(wParam)), (int)(short)HIWORD(wParam)), 0L) ! #define HANDLE_WM_DROPFILES(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HDROP)(wParam)), 0L) ! #define HANDLE_WM_CHAR(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) ! #define HANDLE_WM_SYSDEADCHAR(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) ! #define HANDLE_WM_DEADCHAR(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) #endif /* __MINGW32__ */ #ifndef GET_X_LPARAM --- 34,146 ---- #ifdef __MINGW32__ ! /* ! * Add a lot of missing defines. ! * They are not always missing, we need the #ifndef's. ! */ ! # ifndef _cdecl ! # define _cdecl ! # endif ! # ifndef IsMinimized ! # define IsMinimized(hwnd) IsIconic(hwnd) ! # endif ! # ifndef IsMaximized ! # define IsMaximized(hwnd) IsZoomed(hwnd) ! # endif ! # ifndef SelectFont ! # define SelectFont(hdc, hfont) ((HFONT)SelectObject((hdc), (HGDIOBJ)(HFONT)(hfont))) ! # endif ! # ifndef GetStockBrush ! # define GetStockBrush(i) ((HBRUSH)GetStockObject(i)) ! # endif ! # ifndef DeleteBrush ! # define DeleteBrush(hbr) DeleteObject((HGDIOBJ)(HBRUSH)(hbr)) ! # endif ! # ifndef HANDLE_WM_RBUTTONDBLCLK ! # define HANDLE_WM_RBUTTONDBLCLK(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_MBUTTONUP ! # define HANDLE_WM_MBUTTONUP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_MBUTTONDBLCLK ! # define HANDLE_WM_MBUTTONDBLCLK(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_LBUTTONDBLCLK ! # define HANDLE_WM_LBUTTONDBLCLK(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_RBUTTONDOWN ! # define HANDLE_WM_RBUTTONDOWN(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_MOUSEMOVE ! # define HANDLE_WM_MOUSEMOVE(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_RBUTTONUP ! # define HANDLE_WM_RBUTTONUP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_MBUTTONDOWN ! # define HANDLE_WM_MBUTTONDOWN(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_LBUTTONUP ! # define HANDLE_WM_LBUTTONUP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_LBUTTONDOWN ! # define HANDLE_WM_LBUTTONDOWN(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam), (UINT)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_SYSCHAR ! # define HANDLE_WM_SYSCHAR(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) ! # endif ! # ifndef HANDLE_WM_ACTIVATEAPP ! # define HANDLE_WM_ACTIVATEAPP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (BOOL)(wParam), (DWORD)(lParam)), 0L) ! # endif ! # ifndef HANDLE_WM_WINDOWPOSCHANGING ! # define HANDLE_WM_WINDOWPOSCHANGING(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (LPWINDOWPOS)(lParam)) ! # endif ! # ifndef HANDLE_WM_VSCROLL ! # define HANDLE_WM_VSCROLL(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(lParam), (UINT)(LOWORD(wParam)), (int)(short)HIWORD(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_SETFOCUS ! # define HANDLE_WM_SETFOCUS(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_KILLFOCUS ! # define HANDLE_WM_KILLFOCUS(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_HSCROLL ! # define HANDLE_WM_HSCROLL(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(lParam), (UINT)(LOWORD(wParam)), (int)(short)HIWORD(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_DROPFILES ! # define HANDLE_WM_DROPFILES(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HDROP)(wParam)), 0L) ! # endif ! # ifndef HANDLE_WM_CHAR ! # define HANDLE_WM_CHAR(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) ! # endif ! # ifndef HANDLE_WM_SYSDEADCHAR ! # define HANDLE_WM_SYSDEADCHAR(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) ! # endif ! # ifndef HANDLE_WM_DEADCHAR ! # define HANDLE_WM_DEADCHAR(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) + # endif #endif /* __MINGW32__ */ #ifndef GET_X_LPARAM *************** *** 337,343 **** #ifdef WIN32_FIND_REPLACE static void initialise_findrep(char_u *initial_string); - static void find_rep_mode_adjust(char_u * buf); #endif #ifdef DEBUG --- 394,399 ---- *************** *** 2808,2846 **** static SysColorTable sys_table[] = { ! "SYS_3DDKSHADOW", COLOR_3DDKSHADOW, ! "SYS_3DFACE", COLOR_3DFACE, ! "SYS_BTNFACE", COLOR_BTNFACE, ! "SYS_3DHILIGHT", COLOR_3DHILIGHT, #ifndef __MINGW32__ ! "SYS_3DHIGHLIGHT", COLOR_3DHIGHLIGHT, #endif ! "SYS_BTNHILIGHT", COLOR_BTNHILIGHT, ! "SYS_BTNHIGHLIGHT", COLOR_BTNHIGHLIGHT, ! "SYS_3DLIGHT", COLOR_3DLIGHT, ! "SYS_3DSHADOW", COLOR_3DSHADOW, ! "SYS_BTNSHADOW", COLOR_BTNSHADOW, ! "SYS_ACTIVEBORDER", COLOR_ACTIVEBORDER, ! "SYS_ACTIVECAPTION", COLOR_ACTIVECAPTION, ! "SYS_APPWORKSPACE", COLOR_APPWORKSPACE, ! "SYS_BACKGROUND", COLOR_BACKGROUND, ! "SYS_DESKTOP", COLOR_DESKTOP, ! "SYS_BTNTEXT", COLOR_BTNTEXT, ! "SYS_CAPTIONTEXT", COLOR_CAPTIONTEXT, ! "SYS_GRAYTEXT", COLOR_GRAYTEXT, ! "SYS_HIGHLIGHT", COLOR_HIGHLIGHT, ! "SYS_HIGHLIGHTTEXT", COLOR_HIGHLIGHTTEXT, ! "SYS_INACTIVEBORDER", COLOR_INACTIVEBORDER, ! "SYS_INACTIVECAPTION", COLOR_INACTIVECAPTION, ! "SYS_INACTIVECAPTIONTEXT", COLOR_INACTIVECAPTIONTEXT, ! "SYS_INFOBK", COLOR_INFOBK, ! "SYS_INFOTEXT", COLOR_INFOTEXT, ! "SYS_MENU", COLOR_MENU, ! "SYS_MENUTEXT", COLOR_MENUTEXT, ! "SYS_SCROLLBAR", COLOR_SCROLLBAR, ! "SYS_WINDOW", COLOR_WINDOW, ! "SYS_WINDOWFRAME", COLOR_WINDOWFRAME, ! "SYS_WINDOWTEXT", COLOR_WINDOWTEXT, }; int r, g, b; --- 2864,2902 ---- static SysColorTable sys_table[] = { ! {"SYS_3DDKSHADOW", COLOR_3DDKSHADOW}, ! {"SYS_3DFACE", COLOR_3DFACE}, ! {"SYS_BTNFACE", COLOR_BTNFACE}, ! {"SYS_3DHILIGHT", COLOR_3DHILIGHT}, #ifndef __MINGW32__ ! {"SYS_3DHIGHLIGHT", COLOR_3DHIGHLIGHT}, #endif ! {"SYS_BTNHILIGHT", COLOR_BTNHILIGHT}, ! {"SYS_BTNHIGHLIGHT", COLOR_BTNHIGHLIGHT}, ! {"SYS_3DLIGHT", COLOR_3DLIGHT}, ! {"SYS_3DSHADOW", COLOR_3DSHADOW}, ! {"SYS_BTNSHADOW", COLOR_BTNSHADOW}, ! {"SYS_ACTIVEBORDER", COLOR_ACTIVEBORDER}, ! {"SYS_ACTIVECAPTION", COLOR_ACTIVECAPTION}, ! {"SYS_APPWORKSPACE", COLOR_APPWORKSPACE}, ! {"SYS_BACKGROUND", COLOR_BACKGROUND}, ! {"SYS_DESKTOP", COLOR_DESKTOP}, ! {"SYS_BTNTEXT", COLOR_BTNTEXT}, ! {"SYS_CAPTIONTEXT", COLOR_CAPTIONTEXT}, ! {"SYS_GRAYTEXT", COLOR_GRAYTEXT}, ! {"SYS_HIGHLIGHT", COLOR_HIGHLIGHT}, ! {"SYS_HIGHLIGHTTEXT", COLOR_HIGHLIGHTTEXT}, ! {"SYS_INACTIVEBORDER", COLOR_INACTIVEBORDER}, ! {"SYS_INACTIVECAPTION", COLOR_INACTIVECAPTION}, ! {"SYS_INACTIVECAPTIONTEXT", COLOR_INACTIVECAPTIONTEXT}, ! {"SYS_INFOBK", COLOR_INFOBK}, ! {"SYS_INFOTEXT", COLOR_INFOTEXT}, ! {"SYS_MENU", COLOR_MENU}, ! {"SYS_MENUTEXT", COLOR_MENUTEXT}, ! {"SYS_SCROLLBAR", COLOR_SCROLLBAR}, ! {"SYS_WINDOW", COLOR_WINDOW}, ! {"SYS_WINDOWFRAME", COLOR_WINDOWFRAME}, ! {"SYS_WINDOWTEXT", COLOR_WINDOWTEXT} }; int r, g, b; *************** *** 2940,2950 **** gui.currBgColor = color; } ! #if defined(MULTI_BYTE) || defined(PROTO) ! /* * Multi-byte handling, by Sung-Hoon Baek */ static void HanExtTextOut(HDC hdc,int X, int Y, UINT fuOption, const RECT *lprc, LPCTSTR lpString, UINT cbCount, const int *lpDx, BOOL bOpaque) --- 2996,3006 ---- gui.currBgColor = color; } ! #if (defined(MULTI_BYTE) && defined(MULTI_BYTE_IME)) || defined(PROTO) /* * Multi-byte handling, by Sung-Hoon Baek */ + static void HanExtTextOut(HDC hdc,int X, int Y, UINT fuOption, const RECT *lprc, LPCTSTR lpString, UINT cbCount, const int *lpDx, BOOL bOpaque) *************** *** 2993,2999 **** } if (i > 0) { ! int OldBkMode; if (bOpaque) { --- 3049,3055 ---- } if (i > 0) { ! int OldBkMode = 0; if (bOpaque) { *************** *** 3012,3019 **** ExtTextOut(hdc,X,Y,fuOption,lprc,lpString,cbCount,lpDx); } - # if defined(MULTI_BYTE_IME) || defined(PROTO) - #include #include --- 3068,3073 ---- *************** *** 3316,3324 **** } # endif /* not used */ ! # endif /* MULTI_BYTE_IME */ ! ! #endif /* MULTI_BYTE */ #define UNIBUFSIZE 2000 /* a big buffer */ --- 3370,3376 ---- } # endif /* not used */ ! #endif /* MULTI_BYTE && MULTI_BYTE_IME */ #define UNIBUFSIZE 2000 /* a big buffer */ *************** *** 3441,3450 **** unicodebuf = (WCHAR *)alloc(UNIBUFSIZE); if (unicodebuf != NULL) { ! if (len = MultiByteToWideChar(is_dbcs, MB_PRECOMPOSED, (char *)s, len, ! (LPWSTR)unicodebuf, UNIBUFSIZE)) ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row), 0, NULL, unicodebuf, len, NULL); } --- 3493,3502 ---- unicodebuf = (WCHAR *)alloc(UNIBUFSIZE); if (unicodebuf != NULL) { ! if ((len = MultiByteToWideChar(is_dbcs, MB_PRECOMPOSED, (char *)s, len, ! (LPWSTR)unicodebuf, UNIBUFSIZE))) ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row), 0, NULL, unicodebuf, len, NULL); } *************** *** 3559,3565 **** char_u *title, char_u *icon) { ! SetWindowText(s_hwnd, (LPCSTR)(title == NULL ? "VIM" : title)); } /* --- 3611,3617 ---- char_u *title, char_u *icon) { ! SetWindowText(s_hwnd, (LPCSTR)(title == NULL ? "VIM" : (char *)title)); } /* *************** *** 5204,5211 **** HFONT font, oldFont; int col, spaceWidth, len; int columnWidths[2]; ! char_u *label, *text, *end, *acEnd; ! int padding0, padding1, padding2; int sepPadding=0; /* --- 5256,5263 ---- HFONT font, oldFont; int col, spaceWidth, len; int columnWidths[2]; ! char_u *label, *text, *end, *acEnd = NULL; ! int padding0, padding1, padding2 = 0; int sepPadding=0; /* *************** *** 5609,5615 **** /* * reference by index */ ! i = strtol(name + 7, &dummy, 0); return i; } /* --- 5659,5665 ---- /* * reference by index */ ! i = strtol(name + 7, (char **)&dummy, 0); return i; } /* *** ../vim-5.6.22/src/os_w32exe.c Thu Feb 4 19:01:30 1999 --- src/os_w32exe.c Thu Jan 27 10:36:55 2000 *************** *** 14,30 **** #include - /* cproto doesn't create a prototype for main() */ #ifdef __MINGW32__ ! # define _cdecl #endif int _cdecl #if defined(USE_GUI_WIN32) VimMain #else ! main #endif ! __ARGS((int argc, char **argv)); int (_cdecl *pmain)(int, char **); #ifndef PROTO --- 14,33 ---- #include #ifdef __MINGW32__ ! # ifndef _cdecl ! # define _cdecl ! # endif #endif + + /* cproto doesn't create a prototype for main() */ int _cdecl #if defined(USE_GUI_WIN32) VimMain #else ! main #endif ! __ARGS((int argc, char **argv)); int (_cdecl *pmain)(int, char **); #ifndef PROTO *** ../vim-5.6.22/src/os_win32.c Mon Jan 24 13:12:12 2000 --- src/os_win32.c Sat Mar 25 17:38:48 2000 *************** *** 50,66 **** #endif #ifdef __MINGW32__ ! # define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 ! # define RIGHTMOST_BUTTON_PRESSED 0x0002 ! # define FROM_LEFT_2ND_BUTTON_PRESSED 0x0004 ! # define FROM_LEFT_3RD_BUTTON_PRESSED 0x0008 ! # define FROM_LEFT_4TH_BUTTON_PRESSED 0x0010 /* * EventFlags */ ! # define MOUSE_MOVED 0x0001 ! # define DOUBLE_CLICK 0x0002 #endif /* Record all output and all keyboard & mouse input */ --- 50,80 ---- #endif #ifdef __MINGW32__ ! # ifndef FROM_LEFT_1ST_BUTTON_PRESSED ! # define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 ! # endif ! # ifndef RIGHTMOST_BUTTON_PRESSED ! # define RIGHTMOST_BUTTON_PRESSED 0x0002 ! # endif ! # ifndef FROM_LEFT_2ND_BUTTON_PRESSED ! # define FROM_LEFT_2ND_BUTTON_PRESSED 0x0004 ! # endif ! # ifndef FROM_LEFT_3RD_BUTTON_PRESSED ! # define FROM_LEFT_3RD_BUTTON_PRESSED 0x0008 ! # endif ! # ifndef FROM_LEFT_4TH_BUTTON_PRESSED ! # define FROM_LEFT_4TH_BUTTON_PRESSED 0x0010 ! # endif /* * EventFlags */ ! # ifndef MOUSE_MOVED ! # define MOUSE_MOVED 0x0001 ! # endif ! # ifndef DOUBLE_CLICK ! # define DOUBLE_CLICK 0x0002 ! # endif #endif /* Record all output and all keyboard & mouse input */ *************** *** 2424,2430 **** char_u *cmd, int options) /* SHELL_*, see vim.h */ { ! int x; #ifndef USE_GUI_WIN32 int stopped_termcap_mode = FALSE; #endif --- 2444,2450 ---- char_u *cmd, int options) /* SHELL_*, see vim.h */ { ! int x = 0; #ifndef USE_GUI_WIN32 int stopped_termcap_mode = FALSE; #endif *************** *** 2499,2505 **** si.dwFlags = 0; si.cbReserved2 = 0; si.lpReserved2 = NULL; ! sprintf((char *)newcmd, "%s\0", cmd+6); if (*cmd == '"') *newcmd = '"'; /* --- 2519,2525 ---- si.dwFlags = 0; si.cbReserved2 = 0; si.lpReserved2 = NULL; ! STRCPY(newcmd, cmd + 6); if (*cmd == '"') *newcmd = '"'; /* *************** *** 3764,3776 **** if (argstring != NULL) { ProcAdd = (MYSTRPROC) GetProcAddress(hinstLib, funcname); ! if (fRunTimeLinkSuccess = (ProcAdd != NULL)) retval = (ProcAdd) (argstring); } else { ProcAddI = (MYINTPROC) GetProcAddress(hinstLib, funcname); ! if (fRunTimeLinkSuccess = (ProcAddI != NULL)) retval = (ProcAddI) (argint); } --- 3784,3796 ---- if (argstring != NULL) { ProcAdd = (MYSTRPROC) GetProcAddress(hinstLib, funcname); ! if ((fRunTimeLinkSuccess = (ProcAdd != NULL))) retval = (ProcAdd) (argstring); } else { ProcAddI = (MYINTPROC) GetProcAddress(hinstLib, funcname); ! if ((fRunTimeLinkSuccess = (ProcAddI != NULL))) retval = (ProcAddI) (argint); } *************** *** 3911,3917 **** void clip_mch_request_selection() { ! int type; HGLOBAL hMem; char_u *str = NULL; --- 3931,3937 ---- void clip_mch_request_selection() { ! int type = 0; HGLOBAL hMem; char_u *str = NULL; *** ../vim-5.6.22/src/syntax.c Tue Jan 11 18:49:27 2000 --- src/syntax.c Wed Jan 26 12:18:14 2000 *************** *** 4288,4294 **** short **list; /* where to store the resulting list, if not NULL, the list is silently skipped! */ { ! char_u *p; char_u *end; int round; int count; --- 4288,4294 ---- short **list; /* where to store the resulting list, if not NULL, the list is silently skipped! */ { ! char_u *p = NULL; char_u *end; int round; int count; *** ../vim-5.6.22/src/vim.rc Sat Feb 20 20:22:51 1999 --- src/vim.rc Thu Jan 27 10:41:14 2000 *************** *** 11,18 **** #ifdef MING # include ! # define VS_FFI_FILEFLAGSMASK 0x0000003FL ! # define VOS__WINDOWS32 0x00000004L #else # include #endif --- 11,22 ---- #ifdef MING # include ! # ifndef VS_FFI_FILEFLAGSMASK ! # define VS_FFI_FILEFLAGSMASK 0x0000003FL ! # endif ! # ifdef VOS__WINDOWS32 ! # define VOS__WINDOWS32 0x00000004L ! # endif #else # include #endif *** ../vim-5.6.22/src/version.c Sat Mar 25 17:44:31 2000 --- src/version.c Sat Mar 25 17:44:00 2000 *************** *** 420,421 **** --- 420,423 ---- { /* Add new patch number below this line */ + /**/ + 23, /**/ -- DINGO: You must spank her well and after you have spanked her you may deal with her as you like and then ... spank me. AMAZING: And spank me! STUNNER: And me. LOVELY: And me. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /-/-- Bram Moolenaar --- Bram@moolenaar.net --- http://www.moolenaar.net --\-\ \-\-- Vim: http://www.vim.org ---- ICCF Holland: http://www.vim.org/iccf --/-/