1 To: [email protected]

     2 Subject: Patch 7.2.108

     3 Fcc: outbox

     4 From: Bram Moolenaar <[email protected]>

     5 Mime-Version: 1.0

     6 Content-Type: text/plain; charset=ISO-8859-1

     7 Content-Transfer-Encoding: 8bit

     8 ------------

     9 

    10 Patch 7.2.108 (after 7.2.105)

    11 Problem:    Can't build without the diff feature.

    12 Solution:   Add #ifdef.

    13 Files:	    src/option.c

    14 

    15 

    16 *** ../vim-7.2.107/src/option.c	Wed Feb 11 16:45:56 2009

    17 --- src/option.c	Wed Feb 11 22:21:16 2009

    18 ***************

    19 *** 4127,4132 ****

    20 --- 4127,4133 ----

    21   		    errmsg = (char_u *)_("E520: Not allowed in a modeline");

    22   		    goto skip;

    23   		}

    24 + #ifdef FEAT_DIFF

    25   		/* In diff mode some options are overruled.  This avoids that

    26   		 * 'foldmethod' becomes "marker" instead of "diff" and that

    27   		 * "wrap" gets set. */

    28 ***************

    29 *** 4134,4139 ****

    30 --- 4135,4141 ----

    31   			&& (options[opt_idx].indir == PV_FDM

    32   			    || options[opt_idx].indir == PV_WRAP))

    33   		    goto skip;

    34 + #endif

    35   	    }

    36   

    37   #ifdef HAVE_SANDBOX

    38 *** ../vim-7.2.107/src/version.c	Wed Feb 11 18:46:48 2009

    39 --- src/version.c	Wed Feb 11 22:46:40 2009

    40 ***************

    41 *** 678,679 ****

    42 --- 678,681 ----

    43   {   /* Add new patch number below this line */

    44 + /**/

    45 +     108,

    46   /**/

    47 

    48 -- 

    49 hundred-and-one symptoms of being an internet addict:

    50 80. At parties, you introduce your spouse as your "service provider."

    51 

    52  /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\

    53 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

    54 \\\        download, build and distribute -- http://www.A-A-P.org        ///

    55  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///