lkundrak / rpms / vim

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