diff --git a/src/proto.h b/src/proto.h
index c81212cc8654654f9e7e423e404757f76f77b710..5191e7505b324220e7e38c83d6f30d056c2a7946 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -255,7 +255,7 @@ extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path,
 # include "if_perlsfio.pro"
 #endif
 
-#if defined(FEAT_MBYTE) && defined(MACOS_X)
+#ifdef MACOS_CONVERT
 # include "os_mac_conv.pro"
 #endif
 
diff --git a/src/testdir/test61.ok b/src/testdir/test61.ok
new file mode 100644
index 0000000000000000000000000000000000000000..0a22457b687ed137c26e3950071d1194538e4f83
--- /dev/null
+++ b/src/testdir/test61.ok
@@ -0,0 +1,22 @@
+456789
+3456789
+23456789
+123456789
+123456789
+1111 -----
+123456
+1234567
+12345678
+123456789
+456789
+3456789
+23456789
+123456789
+123456789
+123456
+2222 -----
+123456abc
+123456
+123456789
+123456
+123456abc
diff --git a/src/vim.h b/src/vim.h
index 5b176d453a28607752f01bf0757ddc27a2f207ea..b49b144a27bbfb8ab8234d67a9949dcc4551bae2 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 @@ enum auto_event
     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 @@ enum auto_event
     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 */