diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-15 22:53:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-15 22:53:57 +0000 |
| commit | 5671873089d516a10c79733182797075071eb5f3 (patch) | |
| tree | acc20341ea28453e7fdcea8b7e73de69ed7fc870 /src/fileio.c | |
| parent | c4675a193dfbba96755e9600e5429a1aac7364f2 (diff) | |
updated for version 7.0225
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c index 8626f60a95..5dd502c823 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1595,7 +1595,7 @@ retry: } else # endif -# ifdef MACOS_X +# ifdef MACOS_CONVERT if (fio_flags & FIO_MACROMAN) { /* @@ -5043,7 +5043,7 @@ buf_write_bytes(ip) } # endif -# ifdef MACOS_X +# ifdef MACOS_CONVERT else if (flags & FIO_MACROMAN) { /* @@ -6407,6 +6407,11 @@ buf_check_timestamp(buf, focus) /* Reload the buffer. */ buf_reload(buf, orig_mode); +#ifdef FEAT_AUTOCMD + if (buf_valid(buf)) + (void)apply_autocmds(EVENT_FILECHANGEDSHELLPOST, + buf->b_fname, buf->b_fname, FALSE, buf); +#endif #ifdef FEAT_GUI /* restore this in case an autocommand has set it; it would break * 'mousefocus' */ @@ -6959,6 +6964,7 @@ static struct event_name {"FileAppendPre", EVENT_FILEAPPENDPRE}, {"FileAppendCmd", EVENT_FILEAPPENDCMD}, {"FileChangedShell",EVENT_FILECHANGEDSHELL}, + {"FileChangedShellPost",EVENT_FILECHANGEDSHELLPOST}, {"FileChangedRO", EVENT_FILECHANGEDRO}, {"FileReadPost", EVENT_FILEREADPOST}, {"FileReadPre", EVENT_FILEREADPRE}, @@ -7001,6 +7007,7 @@ static struct event_name {"VimLeavePre", EVENT_VIMLEAVEPRE}, {"WinEnter", EVENT_WINENTER}, {"WinLeave", EVENT_WINLEAVE}, + {"VimResized", EVENT_VIMRESIZED}, {NULL, (event_T)0} }; @@ -8363,7 +8370,8 @@ apply_autocmds_group(event, fname, fname_io, force, group, buf, eap) /* * FileChangedShell never nests, because it can create an endless loop. */ - if (filechangeshell_busy && event == EVENT_FILECHANGEDSHELL) + if (filechangeshell_busy && (event == EVENT_FILECHANGEDSHELL + || event == EVENT_FILECHANGEDSHELLPOST)) goto BYPASS_AU; /* |