diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-01-19 16:31:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-01-19 16:31:47 +0100 |
| commit | c4e4198730dabb34313a6a0325d68e18551f113e (patch) | |
| tree | 426f1dd41b591ee807dc515a5b18e44986c001e8 | |
| parent | 6b29b0e809b14e41def8976190d24f0babddd95c (diff) | |
updated for version 7.2.339v7.2.339
Problem: Part of --startuptime patch is missing.
Solution: Add check for time_fd.
| -rw-r--r-- | src/ex_cmds2.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 6adb071889..d52b203315 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 1fa9dbeb60..5c7c50a5d3 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 339, +/**/ 338, /**/ 337, |