4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: Modeline setting for 'foldmethod' overrules diff options. (Ingo
13 Solution: Don't set 'foldmethod' and 'wrap' from a modeline when 'diff' is
18 *** ../vim-7.2.104/src/option.c Wed Feb 11 11:34:24 2009
19 --- src/option.c Wed Feb 11 16:29:56 2009
22 && options[opt_idx].var == VAR_WIN)
25 ! /* Disallow changing some options from modelines */
26 ! if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE))
28 ! errmsg = (char_u *)_("E520: Not allowed in a modeline");
34 && options[opt_idx].var == VAR_WIN)
37 ! /* Disallow changing some options from modelines. */
38 ! if (opt_flags & OPT_MODELINE)
40 ! if (flags & P_SECURE)
42 ! errmsg = (char_u *)_("E520: Not allowed in a modeline");
45 ! /* In diff mode some options are overruled. This avoids that
46 ! * 'foldmethod' becomes "marker" instead of "diff" and that
47 ! * "wrap" gets set. */
48 ! if (curwin->w_p_diff
49 ! && (options[opt_idx].indir == PV_FDM
50 ! || options[opt_idx].indir == PV_WRAP))
55 *** ../vim-7.2.104/src/version.c Wed Feb 11 16:02:29 2009
56 --- src/version.c Wed Feb 11 16:40:35 2009
60 { /* Add new patch number below this line */
66 hundred-and-one symptoms of being an internet addict:
67 76. Your ISP regards you as a business partner rather than as a customer.
69 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
70 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
71 \\\ download, build and distribute -- http://www.A-A-P.org ///
72 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///