Loading ...
Sorry, an error occurred while loading the content.

Patch 7.2.339

Expand Messages
  • Bram Moolenaar
    Patch 7.2.339 (after 7.2.269) Problem: Part of --startuptime patch is missing. Solution: Add check for time_fd. Files: src/ex_cmds2.c ...
    Message 1 of 3 , Jan 19, 2010
    • 0 Attachment
      Patch 7.2.339 (after 7.2.269)
      Problem: Part of --startuptime patch is missing.
      Solution: Add check for time_fd.
      Files: src/ex_cmds2.c


      *** ../vim-7.2.338/src/ex_cmds2.c 2010-01-19 16:21:55.000000000 +0100
      --- src/ex_cmds2.c 2010-01-19 16:02:53.000000000 +0100
      ***************
      *** 3036,3042 ****
      #endif

      #ifdef STARTUPTIME
      ! time_push(&tv_rel, &tv_start);
      #endif

      #ifdef FEAT_EVAL
      --- 3036,3043 ----
      #endif

      #ifdef STARTUPTIME
      ! if (time_fd != NULL)
      ! time_push(&tv_rel, &tv_start);
      #endif

      #ifdef FEAT_EVAL
      ***************
      *** 3162,3170 ****
      verbose_leave();
      }
      #ifdef STARTUPTIME
      ! vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
      ! time_msg((char *)IObuff, &tv_start);
      ! time_pop(&tv_rel);
      #endif

      #ifdef FEAT_EVAL
      --- 3163,3174 ----
      verbose_leave();
      }
      #ifdef STARTUPTIME
      ! 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
      *** ../vim-7.2.338/src/version.c 2010-01-19 16:21:55.000000000 +0100
      --- src/version.c 2010-01-19 16:25:39.000000000 +0100
      ***************
      *** 683,684 ****
      --- 683,686 ----
      { /* Add new patch number below this line */
      + /**/
      + 339,
      /**/

      --
      hundred-and-one symptoms of being an internet addict:
      122. You ask if the Netaholics Anonymous t-shirt you ordered can be
      sent to you via e-mail.

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ download, build and distribute -- http://www.A-A-P.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
    • andalou
      I m using vim 7.2.330 compiled with MingW on Windows XP ... ... ex_cmds2.c: In function `fopen_noinh_readbin : ex_cmds2.c:2819: error: syntax error before
      Message 2 of 3 , Jan 19, 2010
      • 0 Attachment
        I'm using vim 7.2.330 compiled with MingW on Windows XP
        By updating to 7.2.339 I'm getting the following error:

        --------------------
        ...
        ex_cmds2.c: In function `fopen_noinh_readbin':
        ex_cmds2.c:2819: error: syntax error before numeric constant
        make: *** [gobjZ/ex_cmds2.o] Error 1
        --------------------

        Many thanks in advance,
        Cesar
      • Sergey Khorev
        ... Seems like a typo in ex_cmds2.c. That should fix it: ... *************** *** 2816,2822 **** { int fd_tmp = mch_open(filename, O_RDONLY # ifdef WIN32 !
        Message 3 of 3 , Jan 19, 2010
        • 0 Attachment
          > ex_cmds2.c: In function `fopen_noinh_readbin':
          > ex_cmds2.c:2819: error: syntax error before numeric constant
          > make: *** [gobjZ/ex_cmds2.o] Error 1

          Seems like a typo in ex_cmds2.c. That should fix it:

          *** ../vim72.342/src/ex_cmds2.c Tue Jan 19 19:51:15 2010
          --- src/ex_cmds2.c Tue Jan 19 21:00:19 2010
          ***************
          *** 2816,2822 ****
          {
          int fd_tmp = mch_open(filename, O_RDONLY
          # ifdef WIN32
          ! O_BINARY | O_NOINHERIT
          # endif
          , 0);

          --- 2816,2822 ----
          {
          int fd_tmp = mch_open(filename, O_RDONLY
          # ifdef WIN32
          ! | O_BINARY | O_NOINHERIT
          # endif
          , 0);
        Your message has been successfully submitted and would be delivered to recipients shortly.