Karsten Hopp c69885
To: vim-dev@vim.org
Karsten Hopp c69885
Subject: Patch 7.2.339
Karsten Hopp c69885
Fcc: outbox
Karsten Hopp c69885
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp c69885
Mime-Version: 1.0
Karsten Hopp c69885
Content-Type: text/plain; charset=UTF-8
Karsten Hopp c69885
Content-Transfer-Encoding: 8bit
Karsten Hopp c69885
------------
Karsten Hopp c69885
Karsten Hopp c69885
Patch 7.2.339 (after 7.2.269)
Karsten Hopp c69885
Problem:    Part of --startuptime patch is missing.
Karsten Hopp c69885
Solution:   Add check for time_fd.
Karsten Hopp c69885
Files:	    src/ex_cmds2.c
Karsten Hopp c69885
Karsten Hopp c69885
Karsten Hopp c69885
*** ../vim-7.2.338/src/ex_cmds2.c	2010-01-19 16:21:55.000000000 +0100
Karsten Hopp c69885
--- src/ex_cmds2.c	2010-01-19 16:02:53.000000000 +0100
Karsten Hopp c69885
***************
Karsten Hopp c69885
*** 3036,3042 ****
Karsten Hopp c69885
  #endif
Karsten Hopp c69885
  
Karsten Hopp c69885
  #ifdef STARTUPTIME
Karsten Hopp c69885
!     time_push(&tv_rel, &tv_start);
Karsten Hopp c69885
  #endif
Karsten Hopp c69885
  
Karsten Hopp c69885
  #ifdef FEAT_EVAL
Karsten Hopp c69885
--- 3036,3043 ----
Karsten Hopp c69885
  #endif
Karsten Hopp c69885
  
Karsten Hopp c69885
  #ifdef STARTUPTIME
Karsten Hopp c69885
!     if (time_fd != NULL)
Karsten Hopp c69885
! 	time_push(&tv_rel, &tv_start);
Karsten Hopp c69885
  #endif
Karsten Hopp c69885
  
Karsten Hopp c69885
  #ifdef FEAT_EVAL
Karsten Hopp c69885
***************
Karsten Hopp c69885
*** 3162,3170 ****
Karsten Hopp c69885
  	verbose_leave();
Karsten Hopp c69885
      }
Karsten Hopp c69885
  #ifdef STARTUPTIME
Karsten Hopp c69885
!     vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
Karsten Hopp c69885
!     time_msg((char *)IObuff, &tv_start);
Karsten Hopp c69885
!     time_pop(&tv_rel);
Karsten Hopp c69885
  #endif
Karsten Hopp c69885
  
Karsten Hopp c69885
  #ifdef FEAT_EVAL
Karsten Hopp c69885
--- 3163,3174 ----
Karsten Hopp c69885
  	verbose_leave();
Karsten Hopp c69885
      }
Karsten Hopp c69885
  #ifdef STARTUPTIME
Karsten Hopp c69885
!     if (time_fd != NULL)
Karsten Hopp c69885
!     {
Karsten Hopp c69885
! 	vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
Karsten Hopp c69885
! 	time_msg((char *)IObuff, &tv_start);
Karsten Hopp c69885
! 	time_pop(&tv_rel);
Karsten Hopp c69885
!     }
Karsten Hopp c69885
  #endif
Karsten Hopp c69885
  
Karsten Hopp c69885
  #ifdef FEAT_EVAL
Karsten Hopp c69885
*** ../vim-7.2.338/src/version.c	2010-01-19 16:21:55.000000000 +0100
Karsten Hopp c69885
--- src/version.c	2010-01-19 16:25:39.000000000 +0100
Karsten Hopp c69885
***************
Karsten Hopp c69885
*** 683,684 ****
Karsten Hopp c69885
--- 683,686 ----
Karsten Hopp c69885
  {   /* Add new patch number below this line */
Karsten Hopp c69885
+ /**/
Karsten Hopp c69885
+     339,
Karsten Hopp c69885
  /**/
Karsten Hopp c69885
Karsten Hopp c69885
-- 
Karsten Hopp c69885
hundred-and-one symptoms of being an internet addict:
Karsten Hopp c69885
122. You ask if the Netaholics Anonymous t-shirt you ordered can be
Karsten Hopp c69885
     sent to you via e-mail.
Karsten Hopp c69885
Karsten Hopp c69885
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp c69885
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp c69885
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp c69885
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///