components/vim/vim72-patches/7.2.208
changeset 379 c6a17bba1da3
parent 378 f0b61ed1d10d
child 380 e92b3b4a1c66
equal deleted inserted replaced
378:f0b61ed1d10d 379:c6a17bba1da3
     1 To: [email protected]
       
     2 Subject: Patch 7.2.208
       
     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.208
       
    11 Problem:    "set novice" gives an error message, it should be ignored.
       
    12 Solution:   Don't see "no" in "novice" as unsetting an option.  (Patrick
       
    13 	    Texier)
       
    14 Files:	    src/option.c
       
    15 
       
    16 
       
    17 *** ../vim-7.2.207/src/option.c	2009-06-16 15:23:07.000000000 +0200
       
    18 --- src/option.c	2009-06-16 17:35:08.000000000 +0200
       
    19 ***************
       
    20 *** 4006,4012 ****
       
    21   	else
       
    22   	{
       
    23   	    prefix = 1;
       
    24 ! 	    if (STRNCMP(arg, "no", 2) == 0)
       
    25   	    {
       
    26   		prefix = 0;
       
    27   		arg += 2;
       
    28 --- 4006,4012 ----
       
    29   	else
       
    30   	{
       
    31   	    prefix = 1;
       
    32 ! 	    if (STRNCMP(arg, "no", 2) == 0 && STRNCMP(arg, "novice", 6) != 0)
       
    33   	    {
       
    34   		prefix = 0;
       
    35   		arg += 2;
       
    36 ***************
       
    37 *** 9757,9763 ****
       
    38   	}
       
    39   	--p;
       
    40       }
       
    41 !     if (STRNCMP(p, "no", 2) == 0)
       
    42       {
       
    43   	xp->xp_context = EXPAND_BOOL_SETTINGS;
       
    44   	p += 2;
       
    45 --- 9757,9763 ----
       
    46   	}
       
    47   	--p;
       
    48       }
       
    49 !     if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0)
       
    50       {
       
    51   	xp->xp_context = EXPAND_BOOL_SETTINGS;
       
    52   	p += 2;
       
    53 *** ../vim-7.2.207/src/version.c	2009-06-16 17:22:38.000000000 +0200
       
    54 --- src/version.c	2009-06-16 17:50:33.000000000 +0200
       
    55 ***************
       
    56 *** 678,679 ****
       
    57 --- 678,681 ----
       
    58   {   /* Add new patch number below this line */
       
    59 + /**/
       
    60 +     208,
       
    61   /**/
       
    62 
       
    63 -- 
       
    64 Now it is such a bizarrely improbable coincidence that anything as
       
    65 mind-bogglingly useful as the Babel fish could have evolved purely by chance
       
    66 that some thinkers have chosen to see it as a final and clinching proof of the
       
    67 NON-existence of God.
       
    68 The argument goes something like this: 'I refuse to prove that I exist,' says
       
    69 God, 'for proof denies faith, and without faith I am nothing.'
       
    70 'But,' says Man, 'the Babel fish is a dead giveaway, isn't it?  It could not
       
    71 have evolved by chance.  It proves you exist, and so therefore, by your own
       
    72 arguments, you don't.  QED.'
       
    73 'Oh dear,' says God, 'I hadn't thought of that,' and promptly vanishes in a
       
    74 puff of logic.
       
    75 'Oh, that was easy,' says Man, and for an encore goes on to prove that black
       
    76 is white and gets himself killed on the next pedestrian crossing.
       
    77 		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
       
    78 
       
    79  /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
       
    80 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
       
    81 \\\        download, build and distribute -- http://www.A-A-P.org        ///
       
    82  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///