]> granicus.if.org Git - vim/commitdiff
updated for version 7.2.339 v7.2.339
authorBram Moolenaar <Bram@vim.org>
Tue, 19 Jan 2010 15:31:47 +0000 (16:31 +0100)
committerBram Moolenaar <Bram@vim.org>
Tue, 19 Jan 2010 15:31:47 +0000 (16:31 +0100)
Problem:    Part of --startuptime patch is missing.
Solution:   Add check for time_fd.

src/ex_cmds2.c
src/version.c

index 6adb071889d92b5057bfcc8c761eb31c4d472ce4..d52b203315e9c970c0fcda1437c3bd6f735264da 100644 (file)
@@ -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
index 1fa9dbeb6017bc8eef2595902934c853f469af45..5c7c50a5d324e05dc5cbe87df9ab70a14e06b96e 100644 (file)
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    339,
 /**/
     338,
 /**/