diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-02-27 23:58:35 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-02-27 23:58:35 +0000 |
| commit | 5e3cb7e8699f855193179a8cb799d1087f4a2ac9 (patch) | |
| tree | 297e019074e2c2b85d5151701fcfae03bf02ceb9 /src/fileio.c | |
| parent | eddf53b02e2b007208b19c74fb616be2c0839b36 (diff) | |
| download | vim-git-5e3cb7e8699f855193179a8cb799d1087f4a2ac9.tar.gz | |
updated for version 7.0209v7.0209
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/fileio.c b/src/fileio.c index 60c62d579..c3ff07c47 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -583,13 +583,8 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags) /* set forced 'fileencoding' */ fenc = enc_canonize(eap->cmd + eap->force_enc); if (fenc != NULL) - { set_string_option_direct((char_u *)"fenc", -1, - fenc, OPT_FREE|OPT_LOCAL); -# ifdef FEAT_EVAL - set_option_scriptID((char_u *)"fenc", current_SID); -# endif - } + fenc, OPT_FREE|OPT_LOCAL, 0); vim_free(fenc); } #endif @@ -2113,13 +2108,8 @@ failed: #ifdef FEAT_MBYTE /* If editing a new file: set 'fenc' for the current buffer. */ if (newfile) - { set_string_option_direct((char_u *)"fenc", -1, fenc, - OPT_FREE|OPT_LOCAL); -# ifdef FEAT_EVAL - set_option_scriptID((char_u *)"fenc", current_SID); -# endif - } + OPT_FREE|OPT_LOCAL, 0); if (fenc_alloced) vim_free(fenc); # ifdef USE_ICONV @@ -7503,7 +7493,8 @@ au_event_disable(what) if (new_ei != NULL) { STRCAT(new_ei, what); - set_string_option_direct((char_u *)"ei", -1, new_ei, OPT_FREE); + set_string_option_direct((char_u *)"ei", -1, new_ei, + OPT_FREE, SID_NONE); vim_free(new_ei); } } @@ -7516,7 +7507,8 @@ au_event_restore(old_ei) { if (old_ei != NULL) { - set_string_option_direct((char_u *)"ei", -1, old_ei, OPT_FREE); + set_string_option_direct((char_u *)"ei", -1, old_ei, + OPT_FREE, SID_NONE); vim_free(old_ei); } } |