components/vim/vim72-patches/7.2.304
changeset 198 172fc01ce997
equal deleted inserted replaced
197:fd801ec0737c 198:172fc01ce997
       
     1 To: [email protected]
       
     2 Subject: Patch 7.2.304
       
     3 Fcc: outbox
       
     4 From: Bram Moolenaar <[email protected]>
       
     5 Mime-Version: 1.0
       
     6 Content-Type: text/plain; charset=UTF-8
       
     7 Content-Transfer-Encoding: 8bit
       
     8 ------------
       
     9 
       
    10 Patch 7.2.304
       
    11 Problem:    Compiler warning for bad pointer cast.
       
    12 Solution:   Use another variable for int pointer.
       
    13 Files:	    src/ops.c
       
    14 
       
    15 
       
    16 *** ../vim-7.2.303/src/ops.c	2009-11-17 12:43:19.000000000 +0100
       
    17 --- src/ops.c	2009-11-18 15:40:26.000000000 +0100
       
    18 ***************
       
    19 *** 5597,5603 ****
       
    20   	    vc.vc_type = CONV_NONE;
       
    21   	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
       
    22   	    {
       
    23 ! 		conv_str = string_convert(&vc, str, (int*)&len);
       
    24   		if (conv_str != NULL)
       
    25   		{
       
    26   		    vim_free(str);
       
    27 --- 5597,5606 ----
       
    28   	    vc.vc_type = CONV_NONE;
       
    29   	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
       
    30   	    {
       
    31 ! 	        int intlen = len;
       
    32 ! 
       
    33 ! 		conv_str = string_convert(&vc, str, &intlen);
       
    34 ! 		len = intlen;
       
    35   		if (conv_str != NULL)
       
    36   		{
       
    37   		    vim_free(str);
       
    38 *** ../vim-7.2.303/src/version.c	2009-11-18 20:12:15.000000000 +0100
       
    39 --- src/version.c	2009-11-25 12:37:36.000000000 +0100
       
    40 ***************
       
    41 *** 683,684 ****
       
    42 --- 683,686 ----
       
    43   {   /* Add new patch number below this line */
       
    44 + /**/
       
    45 +     304,
       
    46   /**/
       
    47 
       
    48 -- 
       
    49 I recommend ordering large cargo containers of paper towels to make up
       
    50 whatever budget underruns you have.  Paper products are always useful and they
       
    51 have the advantage of being completely flushable if you need to make room in
       
    52 the storage area later.
       
    53 				(Scott Adams - The Dilbert principle)
       
    54 
       
    55  /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
       
    56 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
       
    57 \\\        download, build and distribute -- http://www.A-A-P.org        ///
       
    58  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///