summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-05 19:48:25 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-05 19:48:25 +0000
commit4e2a59505ed4b5fdd540ab3582227454462b1651 (patch)
tree12038f8ae276658c04e9fcdf37086bff1b1c35a8
parent13658318b9c2d991ca4df9b8eb72dfacfd0d6f40 (diff)
downloadvim-git-7.2.102.tar.gz
updated for version 7.2-102v7.2.102
-rw-r--r--src/ex_cmds2.c2
-rw-r--r--src/version.c2
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,