diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 02:10:58 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 02:10:58 +0000 |
| commit | 08f9ab81d4c476bdca6e23aba00f615eb811d929 (patch) | |
| tree | ce8796843acf3fd4f1ab43490d74f56131772037 /src/fileio.c | |
| parent | Adding debian version 2:9.1.0199-1. (diff) | |
| download | vim-08f9ab81d4c476bdca6e23aba00f615eb811d929.tar.xz vim-08f9ab81d4c476bdca6e23aba00f615eb811d929.zip | |
Merging upstream version 2:9.1.0374.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 53bfbea..07e05fc 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -225,7 +225,7 @@ readfile( int may_need_lseek = FALSE; #endif - au_did_filetype = FALSE; // reset before triggering any autocommands + curbuf->b_au_did_filetype = FALSE; // reset before triggering any autocommands curbuf->b_no_eol_lnum = 0; // in case it was set by the previous read @@ -2696,7 +2696,7 @@ failed: { apply_autocmds_exarg(EVENT_BUFREADPOST, NULL, sfname, FALSE, curbuf, eap); - if (!au_did_filetype && *curbuf->b_p_ft != NUL) + if (!curbuf->b_au_did_filetype && *curbuf->b_p_ft != NUL) /* * EVENT_FILETYPE was not triggered but the buffer already has a * filetype. Trigger EVENT_FILETYPE using the existing filetype. @@ -4492,7 +4492,7 @@ buf_reload(buf_T *buf, int orig_mode, int reload_options) int old_msg_silent = msg_silent; curbuf->b_flags |= BF_CHECK_RO; // check for RO again - keep_filetype = TRUE; // don't detect 'filetype' + curbuf->b_keep_filetype = TRUE; // don't detect 'filetype' if (shortmess(SHM_FILEINFO)) msg_silent = 1; @@ -4549,7 +4549,7 @@ buf_reload(buf_T *buf, int orig_mode, int reload_options) curwin->w_cursor = old_cursor; check_cursor(); update_topline(); - keep_filetype = FALSE; + curbuf->b_keep_filetype = FALSE; #ifdef FEAT_FOLDING { win_T *wp; |