diff options
-rw-r--r-- | src/ex_cmds2.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 704c7abc3..a4f60c46d 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3013,6 +3013,8 @@ do_source(fname, check_other, is_vimrc) /* Found BOM; setup conversion, skip over BOM and recode the line. */ convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc); p = string_convert(&cookie.conv, firstline + 3, NULL); + if (p == NULL) + p = vim_strsave(firstline + 3); if (p != NULL) { vim_free(firstline); diff --git a/src/version.c b/src/version.c index fc8f51506..858df4c6d 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 102, +/**/ 101, /**/ 100, |