Mercurial > vim
diff src/fileio.c @ 10668:6a252c6afd5b v8.0.0224
patch 8.0.0224: change to 'fileformats' from autocmd does not take effect
commit https://github.com/vim/vim/commit/7a2699e868bca781e26b060a44fc714d87cfa4ba
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 23 21:31:09 2017 +0100
patch 8.0.0224: change to 'fileformats' from autocmd does not take effect
Problem: When 'fileformats' is changed in a BufReadPre auto command, it
does not take effect in readfile(). (Gary Johnson)
Solution: Check the value of 'fileformats' after executing auto commands.
(Christian Brabandt)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 23 Jan 2017 21:45:04 +0100 |
| parents | 01a5f64a7a20 |
| children | d6857a8dc07e |
line wrap: on
line diff
--- a/src/fileio.c +++ b/src/fileio.c @@ -274,9 +274,9 @@ readfile( int msg_save = msg_scroll; linenr_T read_no_eol_lnum = 0; /* non-zero lnum when last line of * last read was missing the eol */ - int try_mac = (vim_strchr(p_ffs, 'm') != NULL); - int try_dos = (vim_strchr(p_ffs, 'd') != NULL); - int try_unix = (vim_strchr(p_ffs, 'x') != NULL); + int try_mac; + int try_dos; + int try_unix; int file_rewind = FALSE; #ifdef FEAT_MBYTE int can_retry; @@ -738,6 +738,10 @@ readfile( curbuf->b_op_start.lnum = ((from == 0) ? 1 : from); curbuf->b_op_start.col = 0; + try_mac = (vim_strchr(p_ffs, 'm') != NULL); + try_dos = (vim_strchr(p_ffs, 'd') != NULL); + try_unix = (vim_strchr(p_ffs, 'x') != NULL); + #ifdef FEAT_AUTOCMD if (!read_buffer) { @@ -769,6 +773,11 @@ readfile( else apply_autocmds_exarg(EVENT_FILEREADPRE, sfname, sfname, FALSE, NULL, eap); + /* autocommands may have changed it */ + try_mac = (vim_strchr(p_ffs, 'm') != NULL); + try_dos = (vim_strchr(p_ffs, 'd') != NULL); + try_unix = (vim_strchr(p_ffs, 'x') != NULL); + if (msg_scrolled == n) msg_scroll = m;