diff options
| author | vimboss <devnull@localhost> | 2009-02-05 19:48:25 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-02-05 19:48:25 +0000 |
| commit | 10cb06adef5edd5f5ac54ab4678b855fd8b8d4ba (patch) | |
| tree | 12038f8ae276658c04e9fcdf37086bff1b1c35a8 | |
| parent | f2d43bd483b40fd42e9ff08a86fcc551417e5cdc (diff) | |
| download | vim-10cb06adef5edd5f5ac54ab4678b855fd8b8d4ba.tar.gz | |
| -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 704c7abc..a4f60c46 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 fc8f5150..858df4c6 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, |