diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-04-08 01:54:58 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-04-08 01:54:58 +0300 |
| commit | 043d8ff9f2389f8deab7934aa0ab4ce88a747f01 (patch) | |
| tree | 4d6fa32d7c1ddaa99c15f80c1a4ba95d5f3ca2da /src/nvim/memline.c | |
| parent | 5992cdf3c27ee9c73cea22e288c6ea6d54867394 (diff) | |
| parent | 13352c00f1909d9296c5f276a3735f5e6f231b39 (diff) | |
| download | rneovim-043d8ff9f2389f8deab7934aa0ab4ce88a747f01.tar.gz rneovim-043d8ff9f2389f8deab7934aa0ab4ce88a747f01.tar.bz2 rneovim-043d8ff9f2389f8deab7934aa0ab4ce88a747f01.zip | |
Merge branch 'master' into luaviml'/lua
Diffstat (limited to 'src/nvim/memline.c')
| -rw-r--r-- | src/nvim/memline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index f9d3751390..5ea2397db3 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -992,7 +992,7 @@ void ml_recover(void) if (b0_ff != 0) set_fileformat(b0_ff - 1, OPT_LOCAL); if (b0_fenc != NULL) { - set_option_value((char_u *)"fenc", 0L, b0_fenc, OPT_LOCAL); + set_option_value("fenc", 0L, (char *)b0_fenc, OPT_LOCAL); xfree(b0_fenc); } unchanged(curbuf, TRUE); |