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

Patch 7.4a.001

Expand Messages
  • Bram Moolenaar
    Patch 7.4a.002 Problem: Valgrind errors in test 89. (Simon Ruderich) Solution: Allocate one more byte. (Dominique Pelle) Files: src/misc2.c ...
    Message 1 of 22 , Jul 7, 2013
    • 0 Attachment
      Patch 7.4a.002
      Problem: Valgrind errors in test 89. (Simon Ruderich)
      Solution: Allocate one more byte. (Dominique Pelle)
      Files: src/misc2.c


      *** ../vim-7.4a.001/src/misc2.c 2013-07-04 21:14:48.000000000 +0200
      --- src/misc2.c 2013-07-07 16:03:35.000000000 +0200
      ***************
      *** 4712,4718 ****
      {
      wc_path = vim_strsave(search_ctx->ffsc_wc_path);
      temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
      ! + (STRLEN(search_ctx->ffsc_fix_path)) - len));
      }

      if (temp == NULL || wc_path == NULL)
      --- 4712,4719 ----
      {
      wc_path = vim_strsave(search_ctx->ffsc_wc_path);
      temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
      ! + STRLEN(search_ctx->ffsc_fix_path + len)
      ! + 1));
      }

      if (temp == NULL || wc_path == NULL)
      *** ../vim-7.4a.001/src/version.c 2013-07-06 16:21:14.000000000 +0200
      --- src/version.c 2013-07-07 16:14:38.000000000 +0200
      ***************
      *** 730,731 ****
      --- 730,733 ----
      { /* Add new patch number below this line */
      + /**/
      + 2,
      /**/

      --
      Kisses may last for as much as, but no more than, five minutes.
      [real standing law in Iowa, United States of America]

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ an exciting new programming language -- http://www.Zimbu.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --
      --
      You received this message from the "vim_dev" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php

      ---
      You received this message because you are subscribed to the Google Groups "vim_dev" group.
      To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
      For more options, visit https://groups.google.com/groups/opt_out.
    • Tony Mechelynck
      ... Oh, does it? Mine (on Linux) doesn t. Try doing a full make (i.e., telling Make to rebuild everything). Normally, the mere fact that version.h has changed,
      Message 2 of 22 , Jul 7, 2013
      • 0 Attachment
        On 07/07/13 15:26, tux- wrote:
        >
        > Tony Mechelynck schrob am Sonntag, 7. Juli 2013 um 06:53 Zeit:
        >
        >> You should already have it.
        >
        > Oh, right, thanks!
        >
        > But why does it still "make" 7.3? :-/ (I use MS Windows, VS 2010.)
        >
        Oh, does it? Mine (on Linux) doesn't. Try doing a full make (i.e.,
        telling Make to rebuild everything).

        Normally, the mere fact that version.h has changed, that it now includes
        the lines

        /*
        * VIM_VERSION_NODOT is used for the runtime directory name.
        * VIM_VERSION_SHORT is copied into the swap file (max. length is 6 chars).
        * VIM_VERSION_MEDIUM is used for the startup-screen.
        * VIM_VERSION_LONG is used for the ":version" command and "Vim -h".
        */
        #define VIM_VERSION_NODOT "vim74a"
        #define VIM_VERSION_SHORT "7.4a"
        #define VIM_VERSION_MEDIUM "7.4a BETA"
        #define VIM_VERSION_LONG "VIM - Vi IMproved 7.4a BETA (2013 Jul 6)"
        #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.4a BETA (2013 Jul 6,
        compiled "

        and that version.o depends on both version.c and version.h (which
        version.c includes) should make Make launch a compile of version.c, even
        in a "partial" build. Of course, if you have changed those very lines in
        your "home changes", then…

        Are you sure your "current" changeset ("hg log -r ." without the quotes)
        is on the default branch and is a descendant of v7-4a-001? To make sure,
        enable and use the graphlog extension as I said earlier. If it isn't, then
        hg up -r default
        # apply your changes again (possibly by hg merge)
        hg commit -m 'local changes, as follows: bla bla bla'
        No new branch! The next fetch will pull changesets the way they are on
        the remote, then merge your changes (it is best to place them somewhere
        in the file where there is low risk of bit-rot).


        Best regards,
        Tony.
        --
        OLD WOMAN: Well, how did you become king, then?
        ARTHUR: The Lady of the Lake, her arm clad in the purest shimmering samite,
        held Excalibur aloft from the bosom of the water to signify by
        Divine
        Providence ... that I, Arthur, was to carry Excalibur ... That is
        why I am your king!
        "Monty Python and the Holy Grail" PYTHON (MONTY)
        PICTURES LTD

        --
        --
        You received this message from the "vim_dev" maillist.
        Do not top-post! Type your reply below the text you are replying to.
        For more information, visit http://www.vim.org/maillist.php

        ---
        You received this message because you are subscribed to the Google Groups "vim_dev" group.
        To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
        For more options, visit https://groups.google.com/groups/opt_out.
      • tux-
        ... hg tags says 7.4 is current. :-/ The hg up command did not change anything, version.h also says 7.4. Hmm. Weird.. -- -- You received this message from
        Message 3 of 22 , Jul 7, 2013
        • 0 Attachment
          Tony Mechelynck schrob am Sonntag, 7. Juli 2013 um 16:22 Zeit:

          > Are you sure your "current" changeset ("hg log -r ." without the quotes)
          > is on the default branch and is a descendant of v7-4a-001?

          "hg tags" says 7.4 is current. :-/
          The "hg up" command did not change anything, version.h also says 7.4.

          Hmm. Weird..

          --
          --
          You received this message from the "vim_dev" maillist.
          Do not top-post! Type your reply below the text you are replying to.
          For more information, visit http://www.vim.org/maillist.php

          ---
          You received this message because you are subscribed to the Google Groups "vim_dev" group.
          To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
          For more options, visit https://groups.google.com/groups/opt_out.
        • Tony Mechelynck
          ... Notwithstanding the email s Subject, this is indeed patch 7.4a.002. Best regards, Tony. -- The doctrine of human equality reposes on this: that there is no
          Message 4 of 22 , Jul 7, 2013
          • 0 Attachment
            On 07/07/13 16:16, Bram Moolenaar wrote:
            >
            > Patch 7.4a.002
            > Problem: Valgrind errors in test 89. (Simon Ruderich)
            > Solution: Allocate one more byte. (Dominique Pelle)
            > Files: src/misc2.c

            Notwithstanding the email's Subject, this is indeed patch 7.4a.002.


            Best regards,
            Tony.
            --
            The doctrine of human equality reposes on this: that there is no man
            really clever who has not found that he is stupid.
            -- Gilbert K. Chesterson

            --
            --
            You received this message from the "vim_dev" maillist.
            Do not top-post! Type your reply below the text you are replying to.
            For more information, visit http://www.vim.org/maillist.php

            ---
            You received this message because you are subscribed to the Google Groups "vim_dev" group.
            To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
            For more options, visit https://groups.google.com/groups/opt_out.
          Your message has been successfully submitted and would be delivered to recipients shortly.