blob: 486ffb3fcc0df21ad1464ff509fa02fde4810e83 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
To: vim-dev@vim.org
Subject: Patch 7.2.105
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.105
Problem: Modeline setting for 'foldmethod' overrules diff options. (Ingo
Karkat)
Solution: Don't set 'foldmethod' and 'wrap' from a modeline when 'diff' is
on.
Files: src/option.c
*** ../vim-7.2.104/src/option.c Wed Feb 11 11:34:24 2009
--- src/option.c Wed Feb 11 16:29:56 2009
***************
*** 4119,4129 ****
&& options[opt_idx].var == VAR_WIN)
goto skip;
! /* Disallow changing some options from modelines */
! if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE))
{
! errmsg = (char_u *)_("E520: Not allowed in a modeline");
! goto skip;
}
#ifdef HAVE_SANDBOX
--- 4119,4139 ----
&& options[opt_idx].var == VAR_WIN)
goto skip;
! /* Disallow changing some options from modelines. */
! if (opt_flags & OPT_MODELINE)
{
! if (flags & P_SECURE)
! {
! errmsg = (char_u *)_("E520: Not allowed in a modeline");
! goto skip;
! }
! /* In diff mode some options are overruled. This avoids that
! * 'foldmethod' becomes "marker" instead of "diff" and that
! * "wrap" gets set. */
! if (curwin->w_p_diff
! && (options[opt_idx].indir == PV_FDM
! || options[opt_idx].indir == PV_WRAP))
! goto skip;
}
#ifdef HAVE_SANDBOX
*** ../vim-7.2.104/src/version.c Wed Feb 11 16:02:29 2009
--- src/version.c Wed Feb 11 16:40:35 2009
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 105,
/**/
--
hundred-and-one symptoms of being an internet addict:
76. Your ISP regards you as a business partner rather than as a customer.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
