From: Bram Moolenaar Date: Tue, 19 Jan 2010 15:31:47 +0000 (+0100) Subject: updated for version 7.2.339 X-Git-Tag: v7.2.339 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4e4198730dabb34313a6a0325d68e18551f113e;p=vim updated for version 7.2.339 Problem: Part of --startuptime patch is missing. Solution: Add check for time_fd. --- diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 6adb07188..d52b20331 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3036,7 +3036,8 @@ do_source(fname, check_other, is_vimrc) #endif #ifdef STARTUPTIME - time_push(&tv_rel, &tv_start); + if (time_fd != NULL) + time_push(&tv_rel, &tv_start); #endif #ifdef FEAT_EVAL @@ -3162,9 +3163,12 @@ do_source(fname, check_other, is_vimrc) verbose_leave(); } #ifdef STARTUPTIME - vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname); - time_msg((char *)IObuff, &tv_start); - time_pop(&tv_rel); + if (time_fd != NULL) + { + vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname); + time_msg((char *)IObuff, &tv_start); + time_pop(&tv_rel); + } #endif #ifdef FEAT_EVAL diff --git a/src/version.c b/src/version.c index 1fa9dbeb6..5c7c50a5d 100644 --- a/src/version.c +++ b/src/version.c @@ -681,6 +681,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 339, /**/ 338, /**/