From: Bram Moolenaar Date: Thu, 5 Feb 2009 19:48:25 +0000 (+0000) Subject: updated for version 7.2-102 X-Git-Tag: v7.2.102 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e2a59505ed4b5fdd540ab3582227454462b1651;p=thirdparty%2Fvim.git updated for version 7.2-102 --- diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 704c7abc3a..a4f60c46d4 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 fc8f515061..858df4c6d6 100644 --- a/src/version.c +++ b/src/version.c @@ -676,6 +676,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 102, /**/ 101, /**/