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

Patch 7.3.527

Expand Messages
  • Bram Moolenaar
    Patch 7.3.527 Problem: Clang complains about non-ASCII characters in a string. Solution: Change to x88 form. (Dominique Pelle) Files: src/charset.c
    Message 1 of 4 , May 25 2:56 AM
    • 0 Attachment
      Patch 7.3.527
      Problem: Clang complains about non-ASCII characters in a string.
      Solution: Change to \x88 form. (Dominique Pelle)
      Files: src/charset.c


      *** ../vim-7.3.526/src/charset.c 2012-01-26 13:40:04.000000000 +0100
      --- src/charset.c 2012-05-25 11:49:58.000000000 +0200
      ***************
      *** 1602,1611 ****
      #define LATIN1LOWER 'l'
      #define LATIN1UPPER 'U'

      - /* !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]%_'abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ */
      static char_u latin1flags[257] = " UUUUUUUUUUUUUUUUUUUUUUUUUU llllllllllllllllllllllllll UUUUUUUUUUUUUUUUUUUUUUU UUUUUUUllllllllllllllllllllllll llllllll";
      ! static char_u latin1upper[257] = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~ € ‚ƒ„…†‡ˆ‰Š‹Œ Ž ‘’“”•–—˜™š›œ žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ÷ØÙÚÛÜÝÞÿ";
      ! static char_u latin1lower[257] = " !\"#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ € ‚ƒ„…†‡ˆ‰Š‹Œ Ž ‘’“”•–—˜™š›œ žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿àáâãäåæçèéêëìíîïðñòóôõö×øùúûüýþßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ";

      int
      vim_islower(c)
      --- 1602,1610 ----
      #define LATIN1LOWER 'l'
      #define LATIN1UPPER 'U'

      static char_u latin1flags[257] = " UUUUUUUUUUUUUUUUUUUUUUUUUU llllllllllllllllllllllllll UUUUUUUUUUUUUUUUUUUUUUU UUUUUUUllllllllllllllllllllllll llllllll";
      ! static char_u latin1upper[257] = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xf7\xd8\xd9\xda\xdb\xdc\xdd\xde\xff";
      ! static char_u latin1lower[257] = " !\"#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xd7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff";

      int
      vim_islower(c)
      *** ../vim-7.3.526/src/version.c 2012-05-25 11:04:34.000000000 +0200
      --- src/version.c 2012-05-25 11:52:06.000000000 +0200
      ***************
      *** 716,717 ****
      --- 716,719 ----
      { /* Add new patch number below this line */
      + /**/
      + 527,
      /**/

      --
      An alien life briefly visits earth. Just before departing it leaves a
      message in the dust on the back of a white van. The world is shocked
      and wants to know what it means. After months of studies the worlds
      best linguistic scientists are able to decipher the message: "Wash me!".

      /// 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
    • John Marriott
      On 25-May-2012 7:56 PM, Bram Moolenaar wrote: Patch 7.3.527 Problem: Clang complains about non-ASCII characters in a string. Solution: Change to x88 form.
      Message 2 of 4 , May 25 6:13 AM
      • 0 Attachment
        On 25-May-2012 7:56 PM, Bram Moolenaar wrote:
        Patch 7.3.527
        Problem:    Clang complains about non-ASCII characters in a string.
        Solution:   Change to \x88 form. (Dominique Pelle)
        Files:	    src/charset.c
        
        
        *** ../vim-7.3.526/src/charset.c	2012-01-26 13:40:04.000000000 +0100
        --- src/charset.c	2012-05-25 11:49:58.000000000 +0200
        ***************
        *** 1602,1611 ****
          #define LATIN1LOWER 'l'
          #define LATIN1UPPER 'U'
          
        - /*                                                                 !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]%_'abcdefghijklmnopqrstuvwxyz{|}~                                  ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×Ø&Atil
        de;™ÃšÃ›ÃœÃÃžÃŸÃ Ã¡Ã¢Ã£Ã¤Ã¥Ã¦Ã§Ã¨Ã©ÃªÃ«Ã¬Ã­Ã®Ã¯Ã°Ã±Ã²Ã³Ã´ÃµÃ¶Ã·Ã¸Ã¹ÃºÃ»Ã¼Ã½Ã¾Ã¿ */
          static char_u latin1flags[257] = "                                                                 UUUUUUUUUUUUUUUUUUUUUUUUUU      llllllllllllllllllllllllll                                                                     UUUUUUUUUUUUUUUUUUUUUUU UUUUUUUllllllllllllllllllllllll llllllll";
        ! static char_u latin1upper[257] = "                                 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~ € ‚ƒ„…†‡ˆ‰Š‹Œ Ž  ‘’“”•–—˜™š›œ žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸&
        Acirc;¹ÂºÂ»Â¼Â½Â¾Â¿Ã€ÃÃ‚ÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ÷ØÙÚÛÜÃ&#
        157;Þÿ";
        ! static char_u latin1lower[257] = "                                 !\"#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ € ‚ƒ„…†‡ˆ‰Š‹Œ Ž  ‘’“”•–—˜™š›œ žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸&
        Acirc;¹ÂºÂ»Â¼Â½Â¾Â¿Ã Ã¡Ã¢Ã£Ã¤Ã¥Ã¦Ã§Ã¨Ã©ÃªÃ«Ã¬Ã­Ã®Ã¯Ã°Ã±Ã²Ã³Ã´ÃµÃ¶Ã—øùúûüýþßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüý&Ati
        lde;¾Ã¿";
          
              int
          vim_islower(c)
        --- 1602,1610 ----
          #define LATIN1LOWER 'l'
          #define LATIN1UPPER 'U'
          
          static char_u latin1flags[257] = "                                                                 UUUUUUUUUUUUUUUUUUUUUUUUUU      llllllllllllllllllllllllll                                                                     UUUUUUUUUUUUUUUUUUUUUUU UUUUUUUllllllllllllllllllllllll llllllll";
        ! static char_u latin1upper[257] = "                                 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xf7\xd8\xd9\xda\xdb\xdc\xdd\xde\xff";
        ! static char_u latin1lower[257] = "                                 !\"#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xd7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff";
          
              int
          vim_islower(c)
        *** ../vim-7.3.526/src/version.c	2012-05-25 11:04:34.000000000 +0200
        --- src/version.c	2012-05-25 11:52:06.000000000 +0200
        ***************
        *** 716,717 ****
        --- 716,719 ----
          {   /* Add new patch number below this line */
        + /**/
        +     527,
          /**/
        
        
        Hi All,

        This patch does not apply cleanly for me (on Windows here). Basically the whole patch to charset.c is rejected.

        Do I have an out-of-date version of the source? I thought it was update-to-date...

        Cheers
        John

        --
        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
      • Dominique Pellé
        ... Hi John I m not sure why the patch does not apply cleanly. It s a bit special since the old code contained non-ASCII latin1 char. Can t you get the latest
        Message 3 of 4 , May 25 9:25 AM
        • 0 Attachment
          John Marriott <basilisk@...> wrote:

          > On 25-May-2012 7:56 PM, Bram Moolenaar wrote:
          >
          > Patch 7.3.527
          > Problem: Clang complains about non-ASCII characters in a string.
          > Solution: Change to \x88 form. (Dominique Pelle)
          > Files: src/charset.c
          >
          >
          > *** ../vim-7.3.526/src/charset.c 2012-01-26 13:40:04.000000000 +0100
          > --- src/charset.c 2012-05-25 11:49:58.000000000 +0200
          ...

          > Hi All,
          >
          > This patch does not apply cleanly for me (on Windows here). Basically the
          > whole patch to charset.c is rejected.
          >
          > Do I have an out-of-date version of the source? I thought it was
          > update-to-date...
          >
          > Cheers
          > John

          Hi John

          I'm not sure why the patch does not apply cleanly.
          It's a bit special since the old code contained non-ASCII latin1 char.

          Can't you get the latest source with Mercurial? It's more
          convenient than using patches. If somehow you don't like
          Mercurial and the patch does not apply cleanly, you can
          download the latest version of src/charset.c here:

          http://code.google.com/p/vim/source/browse/src/charset.c

          (click on "View raw file")

          Regards
          -- Dominique

          --
          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
        • John Marriott
          On 26-May-2012 2:25 AM, Dominique Pell wrote: John Marriott wrote: On 25-May-2012 7:56 PM, Bram Moolenaar wrote: Patch 7.3.527
          Message 4 of 4 , May 31 1:25 PM
          • 0 Attachment
            On 26-May-2012 2:25 AM, Dominique Pellé wrote:
            John Marriott <basilisk@...> wrote:
            
            
            On 25-May-2012 7:56 PM, Bram Moolenaar wrote:
            
            Patch 7.3.527
            Problem:    Clang complains about non-ASCII characters in a string.
            Solution:   Change to \x88 form. (Dominique Pelle)
            Files:	    src/charset.c
            
            
            *** ../vim-7.3.526/src/charset.c	2012-01-26 13:40:04.000000000 +0100
            --- src/charset.c	2012-05-25 11:49:58.000000000 +0200
            
            ...
            
            
            Hi All,
            
            This patch does not apply cleanly for me (on Windows here). Basically the
            whole patch to charset.c is rejected.
            
            Do I have an out-of-date version of the source? I thought it was
            update-to-date...
            
            Cheers
            John
            
            Hi John
            
            I'm not sure why the patch does not apply cleanly.
            It's a bit special since the old code contained non-ASCII latin1 char.
            
            Can't you get the latest source with Mercurial?  It's more
            convenient than using patches.  If somehow you don't like
            Mercurial and the patch does not apply cleanly, you can
            download the latest version of src/charset.c here:
            
            http://code.google.com/p/vim/source/browse/src/charset.c
            
            (click on "View raw file")
            
            Regards
            -- Dominique
            
            
            Hi Dominique,

            I d/l the source via mercurial and all is well, and much more convenient too.

            Many thanks
            Cheers
            John

            --
            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
          Your message has been successfully submitted and would be delivered to recipients shortly.