updated for version 7.0098
diff --git a/src/ascii.h b/src/ascii.h
index 8a344ef..4ab3518 100644
--- a/src/ascii.h
+++ b/src/ascii.h
@@ -47,7 +47,6 @@
#define CTRL_F_STR "\006"
#define CTRL_H_STR "\010"
#define CTRL_V_STR "\026"
-#define CTRL_W_STR "\027"
#define Ctrl_AT 0 /* @ */
#define Ctrl_A 1
@@ -76,7 +75,7 @@
#define Ctrl_X 24
#define Ctrl_Y 25
#define Ctrl_Z 26
-#define Ctrl_LSB 27 /* [ Left Square Bracket */
+ /* CTRL- [ Left Square Bracket == ESC*/
#define Ctrl_BSL 28 /* \ BackSLash */
#define Ctrl_RSB 29 /* ] Right Square Bracket */
#define Ctrl_HAT 30 /* ^ */
@@ -129,7 +128,6 @@
#define CTRL_F_STR "\056"
#define CTRL_H_STR "\026"
#define CTRL_V_STR "\062"
-#define CTRL_W_STR "\046"
#define Ctrl_AT 0x00 /* @ */
#define Ctrl_A 0x01
@@ -158,7 +156,7 @@
#define Ctrl_X 0x18
#define Ctrl_Y 0x19
#define Ctrl_Z 0x3F
-#define Ctrl_LSB 0x27 /* [ Left Square Bracket */
+ /* CTRL- [ Left Square Bracket == ESC*/
#define Ctrl_RSB 0x1D /* ] Right Square Bracket */
#define Ctrl_BSL 0x1C /* \ BackSLash */
#define Ctrl_HAT 0x1E /* ^ */
diff --git a/src/os_w32exe.c b/src/os_w32exe.c
index 8c48fb3..76f9332 100644
--- a/src/os_w32exe.c
+++ b/src/os_w32exe.c
@@ -28,14 +28,14 @@
main
#endif
__ARGS((int argc, char **argv));
-int (_cdecl *pmain)(int, char **);
+static int (_cdecl *pmain)(int, char **);
#ifndef PROTO
#ifdef FEAT_GUI
#ifndef VIMDLL
void _cdecl SaveInst(HINSTANCE hInst);
#endif
-void (_cdecl *pSaveInst)(HINSTANCE);
+static void (_cdecl *pSaveInst)(HINSTANCE);
#endif
/*ARGSUSED*/
diff --git a/src/os_win16.c b/src/os_win16.c
index 1b1ccd7..b0a4f71 100644
--- a/src/os_win16.c
+++ b/src/os_win16.c
@@ -81,11 +81,11 @@
int _cdecl
VimMain
__ARGS((int argc, char **argv));
-int (_cdecl *pmain)(int, char **);
+static int (_cdecl *pmain)(int, char **);
#ifndef PROTO
void _cdecl SaveInst(HINSTANCE hInst);
-void (_cdecl *pSaveInst)(HINSTANCE);
+static void (_cdecl *pSaveInst)(HINSTANCE);
int WINAPI
WinMain(
diff --git a/src/os_win16.h b/src/os_win16.h
index 93b5891..7dd3b9f 100644
--- a/src/os_win16.h
+++ b/src/os_win16.h
@@ -14,7 +14,6 @@
#define BINARY_FILE_IO
#define USE_EXE_NAME /* use argv[0] for $VIM */
-#define NO_COOKED_INPUT /* mch_inchar() doesn't return whole lines */
#define SYNC_DUP_CLOSE /* sync() a file with dup() and close() */
#define USE_TERM_CONSOLE
#define HAVE_STRING_H
@@ -106,8 +105,6 @@
# define ASSERT(f) assert(f)
# endif
-# define VERIFY(f) ASSERT(f)
-# define DEBUG_ONLY(f) (f)
# define TRACE Trace
# define TRACE0(sz) Trace(_T("%s"), _T(sz))
# define TRACE1(sz, p1) Trace(_T(sz), p1)
@@ -122,8 +119,6 @@
/* These macros should all compile away to nothing */
# define ASSERT(f) ((void)0)
-# define VERIFY(f) ((void)f)
-# define DEBUG_ONLY(f) ((void)0)
# define TRACE 1 ? (void)0 : printf
# define TRACE0(sz)
# define TRACE1(sz, p1)