diff options
| -rw-r--r-- | src/ascii.h | 42 | ||||
| -rw-r--r-- | src/beval.h | 38 | ||||
| -rw-r--r-- | src/dosinst.h | 114 | ||||
| -rw-r--r-- | src/feature.h | 124 | ||||
| -rw-r--r-- | src/glbl_ime.h | 20 | ||||
| -rw-r--r-- | src/globals.h | 10 | ||||
| -rw-r--r-- | src/gui.h | 413 | ||||
| -rw-r--r-- | src/gui_at_sb.h | 60 | ||||
| -rw-r--r-- | src/gui_gtk_f.h | 9 | ||||
| -rw-r--r-- | src/gui_gtk_vms.h | 12 | ||||
| -rw-r--r-- | src/gui_x11_pm.h | 2 | ||||
| -rw-r--r-- | src/gui_xmebwp.h | 4 | ||||
| -rw-r--r-- | src/if_cscope.h | 30 | ||||
| -rw-r--r-- | src/if_mzsch.h | 28 | ||||
| -rw-r--r-- | src/if_ole.h | 64 | ||||
| -rw-r--r-- | src/if_py_both.h | 348 | ||||
| -rw-r--r-- | src/iscygpty.h | 2 | ||||
| -rw-r--r-- | src/keymap.h | 205 | ||||
| -rw-r--r-- | src/macros.h | 38 | ||||
| -rw-r--r-- | src/nbdebug.h | 46 | ||||
| -rw-r--r-- | src/option.h | 4 | ||||
| -rw-r--r-- | src/os_amiga.h | 36 | ||||
| -rw-r--r-- | src/os_beos.h | 4 | ||||
| -rw-r--r-- | src/os_dos.h | 14 | ||||
| -rw-r--r-- | src/os_mac.h | 91 | ||||
| -rw-r--r-- | src/os_qnx.h | 2 | ||||
| -rw-r--r-- | src/os_unix.h | 80 | ||||
| -rw-r--r-- | src/os_unixx.h | 18 | ||||
| -rw-r--r-- | src/os_vms_conf.h | 122 | ||||
| -rw-r--r-- | src/os_win32.h | 68 | ||||
| -rw-r--r-- | src/proto.h | 24 | ||||
| -rw-r--r-- | src/regexp.h | 32 | ||||
| -rw-r--r-- | src/spell.h | 312 | ||||
| -rw-r--r-- | src/structs.h | 23 | ||||
| -rw-r--r-- | src/term.h | 340 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/version.h | 2 | ||||
| -rw-r--r-- | src/vimio.h | 4 |
38 files changed, 1390 insertions, 1397 deletions
diff --git a/src/ascii.h b/src/ascii.h index 769e1a071a..139e8a3554 100644 --- a/src/ascii.h +++ b/src/ascii.h @@ -13,7 +13,7 @@ #ifndef EBCDIC -/* IF_EB(ASCII_constant, EBCDIC_constant) */ +// IF_EB(ASCII_constant, EBCDIC_constant) #define IF_EB(a, b) a #define CharOrd(x) ((x) < 'a' ? (x) - 'A' : (x) - 'a') @@ -28,7 +28,7 @@ #define NL '\012' #define NL_STR (char_u *)"\012" #define FF '\014' -#define CAR '\015' /* CR is used by Mac OS X */ +#define CAR '\015' // CR is used by Mac OS X #define ESC '\033' #define ESC_STR (char_u *)"\033" #define ESC_STR_nc "\033" @@ -37,14 +37,14 @@ #define POUND 0xA3 -#define Ctrl_chr(x) (TOUPPER_ASC(x) ^ 0x40) /* '?' -> DEL, '@' -> ^@, etc. */ +#define Ctrl_chr(x) (TOUPPER_ASC(x) ^ 0x40) // '?' -> DEL, '@' -> ^@, etc. #define Meta(x) ((x) | 0x80) #define CTRL_F_STR "\006" #define CTRL_H_STR "\010" #define CTRL_V_STR "\026" -#define Ctrl_AT 0 /* @ */ +#define Ctrl_AT 0 // @ #define Ctrl_A 1 #define Ctrl_B 2 #define Ctrl_C 3 @@ -71,17 +71,17 @@ #define Ctrl_X 24 #define Ctrl_Y 25 #define Ctrl_Z 26 - /* CTRL- [ Left Square Bracket == ESC*/ -#define Ctrl_BSL 28 /* \ BackSLash */ -#define Ctrl_RSB 29 /* ] Right Square Bracket */ -#define Ctrl_HAT 30 /* ^ */ + // CTRL- [ Left Square Bracket == ESC +#define Ctrl_BSL 28 // \ BackSLash +#define Ctrl_RSB 29 // ] Right Square Bracket +#define Ctrl_HAT 30 // ^ #define Ctrl__ 31 #else -/* EBCDIC */ +// EBCDIC -/* IF_EB(ASCII_constant, EBCDIC_constant) */ +// IF_EB(ASCII_constant, EBCDIC_constant) #define IF_EB(a, b) b /* @@ -120,7 +120,7 @@ #define CTRL_H_STR "\026" #define CTRL_V_STR "\062" -#define Ctrl_AT 0x00 /* @ */ +#define Ctrl_AT 0x00 // @ #define Ctrl_A 0x01 #define Ctrl_B 0x02 #define Ctrl_C 0x03 @@ -147,10 +147,10 @@ #define Ctrl_X 0x18 #define Ctrl_Y 0x19 #define Ctrl_Z 0x3F - /* CTRL- [ Left Square Bracket == ESC*/ -#define Ctrl_RSB 0x1D /* ] Right Square Bracket */ -#define Ctrl_BSL 0x1C /* \ BackSLash */ -#define Ctrl_HAT 0x1E /* ^ */ + // CTRL- [ Left Square Bracket == ESC +#define Ctrl_RSB 0x1D // ] Right Square Bracket +#define Ctrl_BSL 0x1C // \ BackSLash +#define Ctrl_HAT 0x1E // ^ #define Ctrl__ 0x1F #define Ctrl_chr(x) (CtrlTable[(x)]) @@ -162,14 +162,14 @@ extern char CtrlCharTable[]; #define MetaChar(x) ((x < ' ') ? MetaCharTable[(x)] : 0) extern char MetaCharTable[]; -#endif /* defined EBCDIC */ +#endif // defined EBCDIC -/* TODO: EBCDIC Code page dependent (here 1047) */ -#define CSI 0x9b /* Control Sequence Introducer */ +// TODO: EBCDIC Code page dependent (here 1047) +#define CSI 0x9b // Control Sequence Introducer #define CSI_STR "\233" -#define DCS 0x90 /* Device Control String */ -#define OSC 0x9d /* Operating System Command */ -#define STERM 0x9c /* String Terminator */ +#define DCS 0x90 // Device Control String +#define OSC 0x9d // Operating System Command +#define STERM 0x9c // String Terminator /* * Character that separates dir names in a path. diff --git a/src/beval.h b/src/beval.h index 60cf1ab9dc..ffe47fffc3 100644 --- a/src/beval.h +++ b/src/beval.h @@ -24,51 +24,51 @@ typedef enum { - ShS_NEUTRAL, /* nothing showing or pending */ - ShS_PENDING, /* data requested from debugger */ - ShS_UPDATE_PENDING, /* switching information displayed */ - ShS_SHOWING /* the balloon is being displayed */ + ShS_NEUTRAL, // nothing showing or pending + ShS_PENDING, // data requested from debugger + ShS_UPDATE_PENDING, // switching information displayed + ShS_SHOWING // the balloon is being displayed } BeState; typedef struct BalloonEvalStruct { #ifdef FEAT_BEVAL_GUI # ifdef FEAT_GUI_GTK - GtkWidget *target; /* widget we are monitoring */ + GtkWidget *target; // widget we are monitoring GtkWidget *balloonShell; GtkWidget *balloonLabel; - unsigned int timerID; /* timer for run */ - BeState showState; /* tells us whats currently going on */ + unsigned int timerID; // timer for run + BeState showState; // tells us whats currently going on int x; int y; - unsigned int state; /* Button/Modifier key state */ + unsigned int state; // Button/Modifier key state # else # if !defined(FEAT_GUI_MSWIN) - Widget target; /* widget we are monitoring */ + Widget target; // widget we are monitoring Widget balloonShell; Widget balloonLabel; - XtIntervalId timerID; /* timer for run */ - BeState showState; /* tells us whats currently going on */ - XtAppContext appContext; /* used in event handler */ + XtIntervalId timerID; // timer for run + BeState showState; // tells us whats currently going on + XtAppContext appContext; // used in event handler Position x; Position y; Position x_root; Position y_root; - int state; /* Button/Modifier key state */ + int state; // Button/Modifier key state # else HWND target; HWND balloon; int x; int y; - BeState showState; /* tells us whats currently going on */ + BeState showState; // tells us whats currently going on # endif # endif # if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MSWIN) - Dimension screen_width; /* screen width in pixels */ - Dimension screen_height; /* screen height in pixels */ + Dimension screen_width; // screen width in pixels + Dimension screen_height; // screen height in pixels # endif void (*msgCB)(struct BalloonEvalStruct *, int); - void *clientData; /* For callback */ + void *clientData; // For callback #endif int ts; // tabstop setting for this buffer @@ -81,11 +81,11 @@ typedef struct BalloonEvalStruct #endif } BalloonEval; -#define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */ +#define EVAL_OFFSET_X 15 // displacement of beval topleft corner from pointer #define EVAL_OFFSET_Y 10 #ifdef FEAT_BEVAL_GUI # include "gui_beval.pro" #endif -#endif /* BEVAL__H and FEAT_BEVAL_GUI */ +#endif // BEVAL__H and FEAT_BEVAL_GUI diff --git a/src/dosinst.h b/src/dosinst.h index a83bb0839f..c9d8c929bf 100644 --- a/src/dosinst.h +++ b/src/dosinst.h @@ -10,7 +10,7 @@ * dosinst.h: Common code for dosinst.c and uninstall.c */ -/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */ +// Visual Studio 2005 has 'deprecated' many of the standard CRT functions #if _MSC_VER >= 1400 # define _CRT_SECURE_NO_DEPRECATE # define _CRT_NONSTDC_NO_DEPRECATE @@ -33,7 +33,7 @@ #endif #ifdef UNIX_LINT -/* Running lint on Unix: Some things are missing. */ +// Running lint on Unix: Some things are missing. char *searchpath(char *name); #endif @@ -52,10 +52,10 @@ char *searchpath(char *name); #define sleep(n) Sleep((n) * 1000) -/* ---------------------------------------- */ +// ---------------------------------------- -#define BUFSIZE (MAX_PATH*2) /* long enough to hold a file name path */ +#define BUFSIZE (MAX_PATH*2) // long enough to hold a file name path #define NUL 0 #define FAIL 0 @@ -81,7 +81,7 @@ char *searchpath(char *name); #define VIM_STARTMENU "Programs\\Vim " VIM_VERSION_SHORT -int interactive; /* non-zero when running interactively */ +int interactive; // non-zero when running interactively /* * Call malloc() and exit when out of memory. @@ -116,7 +116,7 @@ myexit(int n) { if (!interactive) { - /* Present a prompt, otherwise error messages can't be read. */ + // Present a prompt, otherwise error messages can't be read. printf("Press Enter to continue\n"); rewind(stdin); (void)getchar(); @@ -152,8 +152,8 @@ searchpath(char *name) static char widename[2 * BUFSIZE]; static char location[2 * BUFSIZE + 2]; - /* There appears to be a bug in FindExecutableA() on Windows NT. - * Use FindExecutableW() instead... */ + // There appears to be a bug in FindExecutableA() on Windows NT. + // Use FindExecutableW() instead... MultiByteToWideChar(CP_ACP, 0, (LPCTSTR)name, -1, (LPWSTR)widename, BUFSIZE); if (FindExecutableW((LPCWSTR)widename, (LPCWSTR)"", @@ -206,8 +206,8 @@ get_shell_folder_path( * The resulting executable worked on Windows 95, Millennium Edition, and * 2000 Professional. But it was changed after testing... */ - LPITEMIDLIST pidl = 0; /* Pointer to an Item ID list allocated below */ - LPMALLOC pMalloc; /* Pointer to an IMalloc interface */ + LPITEMIDLIST pidl = 0; // Pointer to an Item ID list allocated below + LPMALLOC pMalloc; // Pointer to an IMalloc interface int csidl; int alt_csidl = -1; static int desktop_csidl = -1; @@ -234,7 +234,7 @@ get_shell_folder_path( return FAIL; } - /* Did this stuff before, use the same ID again. */ + // Did this stuff before, use the same ID again. if (*pcsidl >= 0) { csidl = *pcsidl; @@ -242,7 +242,7 @@ get_shell_folder_path( } retry: - /* Initialize pointer to IMalloc interface */ + // Initialize pointer to IMalloc interface if (NOERROR != SHGetMalloc(&pMalloc)) { printf("\nERROR getting interface for shell_folder_name: \"%s\"\n\n", @@ -250,7 +250,7 @@ retry: return FAIL; } - /* Get an ITEMIDLIST corresponding to the folder code */ + // Get an ITEMIDLIST corresponding to the folder code if (NOERROR != SHGetSpecialFolderLocation(0, csidl, &pidl)) { if (alt_csidl < 0 || NOERROR != SHGetSpecialFolderLocation(0, @@ -264,20 +264,20 @@ retry: alt_csidl = -1; } - /* Translate that ITEMIDLIST to a string */ + // Translate that ITEMIDLIST to a string r = SHGetPathFromIDList(pidl, shell_folder_path); - /* Free the data associated with pidl */ + // Free the data associated with pidl pMalloc->lpVtbl->Free(pMalloc, pidl); - /* Release the IMalloc interface */ + // Release the IMalloc interface pMalloc->lpVtbl->Release(pMalloc); if (!r) { if (alt_csidl >= 0) { - /* We probably get here for Windows 95: the "all users" - * desktop/start menu entry doesn't exist. */ + // We probably get here for Windows 95: the "all users" + // desktop/start menu entry doesn't exist. csidl = alt_csidl; alt_csidl = -1; goto retry; @@ -287,9 +287,9 @@ retry: return FAIL; } - /* If there is an alternative: verify we can write in this directory. - * This should cause a retry when the "all users" directory exists but we - * are a normal user and can't write there. */ + // If there is an alternative: verify we can write in this directory. + // This should cause a retry when the "all users" directory exists but we + // are a normal user and can't write there. if (alt_csidl >= 0) { char tbuf[BUFSIZE]; @@ -329,16 +329,16 @@ retry: struct { - char *name; /* Vim exe name (without .exe) */ - char *batname; /* batch file name */ - char *lnkname; /* shortcut file name */ - char *exename; /* exe file name */ - char *exenamearg; /* exe file name when using exearg */ - char *exearg; /* argument for vim.exe or gvim.exe */ - char *oldbat; /* path to existing xxx.bat or NULL */ - char *oldexe; /* path to existing xxx.exe or NULL */ - char batpath[BUFSIZE]; /* path of batch file to create; not - created when it's empty */ + char *name; // Vim exe name (without .exe) + char *batname; // batch file name + char *lnkname; // shortcut file name + char *exename; // exe file name + char *exenamearg; // exe file name when using exearg + char *exearg; // argument for vim.exe or gvim.exe + char *oldbat; // path to existing xxx.bat or NULL + char *oldexe; // path to existing xxx.exe or NULL + char batpath[BUFSIZE]; // path of batch file to create; not + // created when it's empty } targets[TARGET_COUNT] = { {"all", "batch files"}, @@ -382,17 +382,16 @@ run_command(char *cmd) char cmd_buf[BUFSIZE * 2 + 35]; char *p; - /* On WinNT, 'start' is a shell built-in for cmd.exe rather than an - * executable (start.exe) like in Win9x. */ + // On WinNT, 'start' is a shell built-in for cmd.exe rather than an + // executable (start.exe) like in Win9x. cmd_path = searchpath_save("cmd.exe"); if (cmd_path != NULL) { - /* There is a cmd.exe, so this might be Windows NT. If it is, - * we need to call cmd.exe explicitly. If it is a later OS, - * calling cmd.exe won't hurt if it is present. - * Also, "start" on NT expects a window title argument. - */ - /* Replace the slashes with backslashes. */ + // There is a cmd.exe, so this might be Windows NT. If it is, + // we need to call cmd.exe explicitly. If it is a later OS, + // calling cmd.exe won't hurt if it is present. + // Also, "start" on NT expects a window title argument. + // Replace the slashes with backslashes. while ((p = strchr(cmd_path, '/')) != NULL) *p = '\\'; sprintf(cmd_buf, "%s /c start \"vimcmd\" /wait %s", cmd_path, cmd); @@ -400,7 +399,7 @@ run_command(char *cmd) } else { - /* No cmd.exe, just make the call and let the system handle it. */ + // No cmd.exe, just make the call and let the system handle it. sprintf(cmd_buf, "start /w %s", cmd); } system(cmd_buf); @@ -422,7 +421,6 @@ add_pathsep(char *name) /* * The normal chdir() does not change the default drive. This one does. */ -/*ARGSUSED*/ int change_drive(int drive) { @@ -438,17 +436,17 @@ change_drive(int drive) int mch_chdir(char *path) { - if (path[0] == NUL) /* just checking... */ + if (path[0] == NUL) // just checking... return 0; - if (path[1] == ':') /* has a drive name */ + if (path[1] == ':') // has a drive name { if (change_drive(mytoupper(path[0]) - 'A' + 1)) - return -1; /* invalid drive name */ + return -1; // invalid drive name path += 2; } - if (*path == NUL) /* drive name only */ + if (*path == NUL) // drive name only return 0; - return chdir(path); /* let the normal chdir() do the rest */ + return chdir(path); // let the normal chdir() do the rest } /* @@ -457,8 +455,8 @@ mch_chdir(char *path) static char * my_fullpath(char *buf, char *fname, int len) { - /* Only GetModuleFileName() will get the long file name path. - * GetFullPathName() may still use the short (FAT) name. */ + // Only GetModuleFileName() will get the long file name path. + // GetFullPathName() may still use the short (FAT) name. DWORD len_read = GetModuleFileName(NULL, buf, (size_t)len); return (len_read > 0 && len_read < (DWORD)len) ? buf : NULL; @@ -482,11 +480,11 @@ remove_tail(char *path) } -char installdir[MAX_PATH-9]; /* top of the installation dir, where the - install.exe is located, E.g.: - "c:\vim\vim60" */ -int runtimeidx; /* index in installdir[] where "vim60" starts */ -char *sysdrive; /* system drive or "c:\" */ +char installdir[MAX_PATH-9]; // top of the installation dir, where the + // install.exe is located, E.g.: + // "c:\vim\vim60" +int runtimeidx; // index in installdir[] where "vim60" starts +char *sysdrive; // system drive or "c:\" /* * Setup for using this program. @@ -495,20 +493,20 @@ char *sysdrive; /* system drive or "c:\" */ static void do_inits(char **argv) { - /* Find out the full path of our executable. */ + // Find out the full path of our executable. if (my_fullpath(installdir, argv[0], sizeof(installdir)) == NULL) { printf("ERROR: Cannot get name of executable\n"); myexit(1); } - /* remove the tail, the executable name "install.exe" */ + // remove the tail, the executable name "install.exe" remove_tail(installdir); - /* change to the installdir */ + // change to the installdir mch_chdir(installdir); - /* Find the system drive. Only used for searching the Vim executable, not - * very important. */ + // Find the system drive. Only used for searching the Vim executable, not + // very important. sysdrive = getenv("SYSTEMDRIVE"); if (sysdrive == NULL || *sysdrive == NUL) sysdrive = "C:\\"; diff --git a/src/feature.h b/src/feature.h index 428a904591..c4c276c678 100644 --- a/src/feature.h +++ b/src/feature.h @@ -46,11 +46,11 @@ */ #if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \ && !defined(FEAT_BIG) && !defined(FEAT_HUGE) -/* #define FEAT_TINY */ -/* #define FEAT_SMALL */ -/* #define FEAT_NORMAL */ -/* #define FEAT_BIG */ -/* #define FEAT_HUGE */ +// #define FEAT_TINY +// #define FEAT_SMALL +// #define FEAT_NORMAL +// #define FEAT_BIG +// #define FEAT_HUGE #endif /* @@ -153,7 +153,7 @@ */ #ifdef FEAT_NORMAL # define FEAT_DIGRAPHS -/* #define OLD_DIGRAPHS */ +// #define OLD_DIGRAPHS #endif /* @@ -174,7 +174,7 @@ #endif #ifdef FEAT_NORMAL -# define VIM_BACKTICK /* internal backtick expansion */ +# define VIM_BACKTICK // internal backtick expansion #endif /* @@ -217,7 +217,7 @@ * +find_in_path "[I" ":isearch" "^W^I", ":checkpath", etc. */ #ifdef FEAT_NORMAL -# ifdef FEAT_SEARCHPATH /* FEAT_SEARCHPATH is required */ +# ifdef FEAT_SEARCHPATH // FEAT_SEARCHPATH is required # define FEAT_FIND_ID # endif #endif @@ -378,7 +378,7 @@ #ifdef FEAT_NORMAL # define FEAT_STL_OPT # ifndef FEAT_CMDL_INFO -# define FEAT_CMDL_INFO /* 'ruler' is required for 'statusline' */ +# define FEAT_CMDL_INFO // 'ruler' is required for 'statusline' # endif #endif @@ -409,8 +409,8 @@ */ #ifdef FEAT_NORMAL # define FEAT_VIMINFO -/* #define VIMINFO_FILE "$HOME/foo/.viminfo" */ -/* #define VIMINFO_FILE2 "~/bar/.viminfo" */ +// #define VIMINFO_FILE "$HOME/foo/.viminfo" +// #define VIMINFO_FILE2 "~/bar/.viminfo" #endif /* @@ -454,14 +454,14 @@ * (used only with NO_BUILTIN_TCAPS not defined). */ #ifdef HAVE_TGETENT -/* #define NO_BUILTIN_TCAPS */ +// #define NO_BUILTIN_TCAPS #endif #if !defined(NO_BUILTIN_TCAPS) # ifdef FEAT_BIG # define ALL_BUILTIN_TCAPS # else -# define SOME_BUILTIN_TCAPS /* default */ +# define SOME_BUILTIN_TCAPS // default # endif #endif @@ -517,10 +517,10 @@ * IME can be used to input chars. Not tested much! */ #if defined(FEAT_GUI_MSWIN) && !defined(FEAT_MBYTE_IME) -/* #define FEAT_MBYTE_IME */ +// #define FEAT_MBYTE_IME # endif -/* Use iconv() when it's available. */ +// Use iconv() when it's available. #if (defined(HAVE_ICONV_H) && defined(HAVE_ICONV)) || defined(DYNAMIC_ICONV) # define USE_ICONV #endif @@ -531,11 +531,11 @@ * this is for Unix and VMS only. */ #ifndef FEAT_XIM -/* #define FEAT_XIM */ +// #define FEAT_XIM #endif #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) -# define USE_XIM 1 /* needed for GTK include files */ +# define USE_XIM 1 // needed for GTK include files #endif #if defined(FEAT_XIM) @@ -550,14 +550,14 @@ # if defined(HAVE_X11) && !defined(FEAT_GUI_GTK) # define FEAT_XFONTSET # else -/* # define FEAT_XFONTSET */ +// # define FEAT_XFONTSET # endif #endif /* * +libcall libcall() function */ -/* Using dlopen() also requires dlsym() to be available. */ +// Using dlopen() also requires dlsym() to be available. #if defined(HAVE_DLOPEN) && defined(HAVE_DLSYM) # define USE_DLOPEN #endif @@ -593,7 +593,7 @@ # define FEAT_SOUND_CANBERRA #endif -/* There are two ways to use XPM. */ +// There are two ways to use XPM. #if (defined(HAVE_XM_XPMP_H) && defined(FEAT_GUI_MOTIF)) \ || defined(HAVE_X11_XPM_H) # define HAVE_XPM 1 @@ -678,7 +678,7 @@ #if !defined(FEAT_GUI_DIALOG) && (defined(FEAT_GUI_MOTIF) \ || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \ || defined(FEAT_GUI_MSWIN)) -/* need a dialog to show error messages when starting from the desktop */ +// need a dialog to show error messages when starting from the desktop # define FEAT_GUI_DIALOG #endif #if defined(FEAT_GUI_DIALOG) && \ @@ -698,7 +698,7 @@ # define FEAT_TERMGUICOLORS #endif -/* Mac specific thing: Codewarrior interface. */ +// Mac specific thing: Codewarrior interface. #ifdef FEAT_GUI_MAC # define FEAT_CW_EDITOR #endif @@ -735,12 +735,12 @@ * be set to save the screen when starting Vim and * restoring it when exiting. */ -/* #define FEAT_XTERM_SAVE */ +// #define FEAT_XTERM_SAVE /* * DEBUG Output a lot of debugging garbage. */ -/* #define DEBUG */ +// #define DEBUG /* * STARTUPTIME Time the startup process. Writes a file with @@ -755,22 +755,22 @@ /* * MEM_PROFILE Debugging of memory allocation and freeing. */ -/* #define MEM_PROFILE */ +// #define MEM_PROFILE /* * VIMRC_FILE Name of the .vimrc file in current dir. */ -/* #define VIMRC_FILE ".vimrc" */ +// #define VIMRC_FILE ".vimrc" /* * EXRC_FILE Name of the .exrc file in current dir. */ -/* #define EXRC_FILE ".exrc" */ +// #define EXRC_FILE ".exrc" /* * GVIMRC_FILE Name of the .gvimrc file in current dir. */ -/* #define GVIMRC_FILE ".gvimrc" */ +// #define GVIMRC_FILE ".gvimrc" /* * SESSION_FILE Name of the default ":mksession" file. @@ -782,49 +782,49 @@ * USR_VIMRC_FILE2 Name of alternate user .vimrc file. * USR_VIMRC_FILE3 Name of alternate user .vimrc file. */ -/* #define USR_VIMRC_FILE "~/foo/.vimrc" */ -/* #define USR_VIMRC_FILE2 "~/bar/.vimrc" */ -/* #define USR_VIMRC_FILE3 "$VIM/.vimrc" */ +// #define USR_VIMRC_FILE "~/foo/.vimrc" +// #define USR_VIMRC_FILE2 "~/bar/.vimrc" +// #define USR_VIMRC_FILE3 "$VIM/.vimrc" /* * VIM_DEFAULTS_FILE Name of the defaults.vim script file */ -/* #define VIM_DEFAULTS_FILE "$VIMRUNTIME/defaults.vim" */ +// #define VIM_DEFAULTS_FILE "$VIMRUNTIME/defaults.vim" /* * EVIM_FILE Name of the evim.vim script file */ -/* #define EVIM_FILE "$VIMRUNTIME/evim.vim" */ +// #define EVIM_FILE "$VIMRUNTIME/evim.vim" /* * USR_EXRC_FILE Name of the user .exrc file. * USR_EXRC_FILE2 Name of the alternate user .exrc file. */ -/* #define USR_EXRC_FILE "~/foo/.exrc" */ -/* #define USR_EXRC_FILE2 "~/bar/.exrc" */ +// #define USR_EXRC_FILE "~/foo/.exrc" +// #define USR_EXRC_FILE2 "~/bar/.exrc" /* * USR_GVIMRC_FILE Name of the user .gvimrc file. * USR_GVIMRC_FILE2 Name of the alternate user .gvimrc file. */ -/* #define USR_GVIMRC_FILE "~/foo/.gvimrc" */ -/* #define USR_GVIMRC_FILE2 "~/bar/.gvimrc" */ -/* #define USR_GVIMRC_FILE3 "$VIM/.gvimrc" */ +// #define USR_GVIMRC_FILE "~/foo/.gvimrc" +// #define USR_GVIMRC_FILE2 "~/bar/.gvimrc" +// #define USR_GVIMRC_FILE3 "$VIM/.gvimrc" /* * SYS_VIMRC_FILE Name of the system-wide .vimrc file. */ -/* #define SYS_VIMRC_FILE "/etc/vimrc" */ +// #define SYS_VIMRC_FILE "/etc/vimrc" /* * SYS_GVIMRC_FILE Name of the system-wide .gvimrc file. */ -/* #define SYS_GVIMRC_FILE "/etc/gvimrc" */ +// #define SYS_GVIMRC_FILE "/etc/gvimrc" /* * DFLT_HELPFILE Name of the help file. */ -/* # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt.gz" */ +// # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt.gz" /* * File names for: @@ -835,17 +835,17 @@ * FTPLUGOF_FILE switch off loading settings files * INDOFF_FILE switch off loading indent files */ -/* # define FILETYPE_FILE "filetype.vim" */ -/* # define FTPLUGIN_FILE "ftplugin.vim" */ -/* # define INDENT_FILE "indent.vim" */ -/* # define FTOFF_FILE "ftoff.vim" */ -/* # define FTPLUGOF_FILE "ftplugof.vim" */ -/* # define INDOFF_FILE "indoff.vim" */ +// # define FILETYPE_FILE "filetype.vim" +// # define FTPLUGIN_FILE "ftplugin.vim" +// # define INDENT_FILE "indent.vim" +// # define FTOFF_FILE "ftoff.vim" +// # define FTPLUGOF_FILE "ftplugof.vim" +// # define INDOFF_FILE "indoff.vim" /* * SYS_MENU_FILE Name of the default menu.vim file. */ -/* # define SYS_MENU_FILE "$VIMRUNTIME/menu.vim" */ +// # define SYS_MENU_FILE "$VIMRUNTIME/menu.vim" /* * SYS_OPTWIN_FILE Name of the default optwin.vim file. @@ -857,7 +857,7 @@ /* * SYNTAX_FNAME Name of a syntax file, where %s is the syntax name. */ -/* #define SYNTAX_FNAME "/foo/%s.vim" */ +// #define SYNTAX_FNAME "/foo/%s.vim" /* * RUNTIME_DIRNAME Generic name for the directory of the runtime files. @@ -873,7 +873,7 @@ * string concatenation. * Also set by "--with-global-runtime" configure argument. */ -/* #define RUNTIME_GLOBAL "/etc/vim" */ +// #define RUNTIME_GLOBAL "/etc/vim" /* * RUNTIME_GLOBAL_AFTER Comma-separated list of directory names for global Vim @@ -882,14 +882,14 @@ * string concatenation. * Also set by "--with-global-runtime" configure argument. */ -/* #define RUNTIME_GLOBAL_AFTER "/etc/vim/after" */ +// #define RUNTIME_GLOBAL_AFTER "/etc/vim/after" /* * MODIFIED_BY Name of who modified Vim. Required when distributing * a modified version of Vim. * Also from the "--with-modified-by" configure argument. */ -/* #define MODIFIED_BY "John Doe" */ +// #define MODIFIED_BY "John Doe" /* * Machine dependent: @@ -901,7 +901,7 @@ * +system Use system() instead of fork/exec for starting a * shell. Doesn't work for the GUI! */ -/* #define USE_SYSTEM */ +// #define USE_SYSTEM /* * +X11 Unix only. Include code for xterm title saving and X @@ -944,7 +944,7 @@ * Always included, since either FEAT_MOUSE_XTERM or * DOS_MOUSE is defined. */ -/* OS/2 and Amiga console have no mouse support */ +// OS/2 and Amiga console have no mouse support #if defined(UNIX) || defined(VMS) # define FEAT_MOUSE_XTERM # ifdef FEAT_BIG @@ -1017,7 +1017,7 @@ #endif #if defined(FEAT_GUI_MSWIN) && defined(FEAT_SMALL) -# define MSWIN_FIND_REPLACE /* include code for find/replace dialog */ +# define MSWIN_FIND_REPLACE // include code for find/replace dialog # define MSWIN_FR_BUFSIZE 256 #endif @@ -1040,11 +1040,11 @@ */ #if defined(FEAT_CLIENTSERVER) && !defined(FEAT_AUTOSERVERNAME) # ifdef MSWIN - /* Always enabled on MS-Windows. */ + // Always enabled on MS-Windows. # define FEAT_AUTOSERVERNAME # else - /* Enable here if you don't use configure. */ -/* # define FEAT_AUTOSERVERNAME */ + // Enable here if you don't use configure. +// # define FEAT_AUTOSERVERNAME # endif #endif @@ -1073,8 +1073,8 @@ # endif #endif -/* GUI and some consoles can change the shape of the cursor. The code is also - * needed for the 'mouseshape' and 'concealcursor' options. */ +// GUI and some consoles can change the shape of the cursor. The code is also +// |