1 To: [email protected] |
|
2 Subject: Patch 7.2.105 |
|
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.105 |
|
11 Problem: Modeline setting for 'foldmethod' overrules diff options. (Ingo |
|
12 Karkat) |
|
13 Solution: Don't set 'foldmethod' and 'wrap' from a modeline when 'diff' is |
|
14 on. |
|
15 Files: src/option.c |
|
16 |
|
17 |
|
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 |
|
20 *************** |
|
21 *** 4119,4129 **** |
|
22 && options[opt_idx].var == VAR_WIN) |
|
23 goto skip; |
|
24 |
|
25 ! /* Disallow changing some options from modelines */ |
|
26 ! if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE)) |
|
27 { |
|
28 ! errmsg = (char_u *)_("E520: Not allowed in a modeline"); |
|
29 ! goto skip; |
|
30 } |
|
31 |
|
32 #ifdef HAVE_SANDBOX |
|
33 --- 4119,4139 ---- |
|
34 && options[opt_idx].var == VAR_WIN) |
|
35 goto skip; |
|
36 |
|
37 ! /* Disallow changing some options from modelines. */ |
|
38 ! if (opt_flags & OPT_MODELINE) |
|
39 { |
|
40 ! if (flags & P_SECURE) |
|
41 ! { |
|
42 ! errmsg = (char_u *)_("E520: Not allowed in a modeline"); |
|
43 ! goto skip; |
|
44 ! } |
|
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)) |
|
51 ! goto skip; |
|
52 } |
|
53 |
|
54 #ifdef HAVE_SANDBOX |
|
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 |
|
57 *************** |
|
58 *** 678,679 **** |
|
59 --- 678,681 ---- |
|
60 { /* Add new patch number below this line */ |
|
61 + /**/ |
|
62 + 105, |
|
63 /**/ |
|
64 |
|
65 -- |
|
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. |
|
68 |
|
69 /// Bram Moolenaar -- [email protected] -- 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 /// |
|