aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/memline.c
diff options
context:
space:
mode:
authorJosh Rahm <rahm@google.com>2022-08-22 15:53:46 -0600
committerJosh Rahm <rahm@google.com>2022-08-22 15:53:46 -0600
commit52ce04a002a882da19bb2c78d1fd8eb4825d669d (patch)
treea39812ccb42dac36b6a251de9f9810e395bba3d9 /src/nvim/memline.c
parent179d3ed87b17988f5fe00d8b99f2611a28212be7 (diff)
parentbaaaa1f2b3b6ae3a989d1362a27e55dc7b0b148a (diff)
downloadrneovim-52ce04a002a882da19bb2c78d1fd8eb4825d669d.tar.gz
rneovim-52ce04a002a882da19bb2c78d1fd8eb4825d669d.tar.bz2
rneovim-52ce04a002a882da19bb2c78d1fd8eb4825d669d.zip
Merge remote-tracking branch 'upstream/master' into floattitle
Diffstat (limited to 'src/nvim/memline.c')
-rw-r--r--src/nvim/memline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 23bc5d59c8..fd8b2c55b5 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -993,7 +993,7 @@ void ml_recover(bool checkext)
set_fileformat(b0_ff - 1, OPT_LOCAL);
}
if (b0_fenc != NULL) {
- set_option_value("fenc", 0L, (char *)b0_fenc, OPT_LOCAL);
+ set_option_value_give_err("fenc", 0L, (char *)b0_fenc, OPT_LOCAL);
xfree(b0_fenc);
}
unchanged(curbuf, true, true);