updated for version 7.0225
diff --git a/src/vim.h b/src/vim.h
index 5b176d4..b49b144 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -80,7 +80,6 @@
# define FEAT_GUI_MAC
#endif
-
#if defined(FEAT_GUI_MOTIF) \
|| defined(FEAT_GUI_GTK) \
|| defined(FEAT_GUI_ATHENA) \
@@ -192,6 +191,11 @@
# endif
#endif
+/* The Mac conversion stuff doesn't work under X11. */
+#if defined(FEAT_MBYTE) && defined(MACOS_X)
+# define MACOS_CONVERT
+#endif
+
/* Can't use "PACKAGE" here, conflicts with a Perl include file. */
#ifndef VIMPACKAGE
# define VIMPACKAGE "vim"
@@ -1083,6 +1087,7 @@
EVENT_FILEAPPENDPRE, /* before appending to a file */
EVENT_FILEAPPENDCMD, /* appende to a file using command */
EVENT_FILECHANGEDSHELL, /* after shell command that changed file */
+ EVENT_FILECHANGEDSHELLPOST, /* after (not) reloading changed file */
EVENT_FILECHANGEDRO, /* before first change to read-only file */
EVENT_FILEREADPOST, /* after reading a file */
EVENT_FILEREADPRE, /* before reading a file */
@@ -1114,6 +1119,7 @@
EVENT_VIMENTER, /* after starting Vim */
EVENT_VIMLEAVE, /* before exiting Vim */
EVENT_VIMLEAVEPRE, /* before exiting Vim and writing .viminfo */
+ EVENT_VIMRESIZED, /* after Vim window was resized */
EVENT_WINENTER, /* after entering a window */
EVENT_WINLEAVE, /* before leaving a window */
EVENT_ENCODINGCHANGED, /* after changing the 'encoding' option */