diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-15 22:48:35 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-15 22:48:35 +0000 |
| commit | db00351723c6c4ea20909fb0039e6f29ed8723ee (patch) | |
| tree | 63012b41601383da6c21dfc4ab223e627e2125d8 /src | |
| parent | 114216c4173e2821b1e0615dd7341c03e6d6d607 (diff) | |
| download | vim-git-db00351723c6c4ea20909fb0039e6f29ed8723ee.tar.gz | |
updated for version 7.0225
Diffstat (limited to 'src')
| -rw-r--r-- | src/proto.h | 2 | ||||
| -rw-r--r-- | src/testdir/test61.ok | 22 | ||||
| -rw-r--r-- | src/vim.h | 8 |
3 files changed, 30 insertions, 2 deletions
diff --git a/src/proto.h b/src/proto.h index c81212cc8..5191e7505 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 000000000..0a22457b6 --- /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 @@ -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 */ |