|
 |
525b14a |
To: vim-dev@vim.org
|
|
|
525b14a |
Subject: Patch 7.2.108
|
|
|
525b14a |
Fcc: outbox
|
|
|
525b14a |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
525b14a |
Mime-Version: 1.0
|
|
|
525b14a |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
525b14a |
Content-Transfer-Encoding: 8bit
|
|
|
525b14a |
------------
|
|
|
525b14a |
|
|
|
525b14a |
Patch 7.2.108 (after 7.2.105)
|
|
|
525b14a |
Problem: Can't build without the diff feature.
|
|
|
525b14a |
Solution: Add #ifdef.
|
|
|
525b14a |
Files: src/option.c
|
|
|
525b14a |
|
|
|
525b14a |
|
|
|
525b14a |
*** ../vim-7.2.107/src/option.c Wed Feb 11 16:45:56 2009
|
|
|
525b14a |
--- src/option.c Wed Feb 11 22:21:16 2009
|
|
|
525b14a |
***************
|
|
|
525b14a |
*** 4127,4132 ****
|
|
|
525b14a |
--- 4127,4133 ----
|
|
|
525b14a |
errmsg = (char_u *)_("E520: Not allowed in a modeline");
|
|
|
525b14a |
goto skip;
|
|
|
525b14a |
}
|
|
|
525b14a |
+ #ifdef FEAT_DIFF
|
|
|
525b14a |
/* In diff mode some options are overruled. This avoids that
|
|
|
525b14a |
* 'foldmethod' becomes "marker" instead of "diff" and that
|
|
|
525b14a |
* "wrap" gets set. */
|
|
|
525b14a |
***************
|
|
|
525b14a |
*** 4134,4139 ****
|
|
|
525b14a |
--- 4135,4141 ----
|
|
|
525b14a |
&& (options[opt_idx].indir == PV_FDM
|
|
|
525b14a |
|| options[opt_idx].indir == PV_WRAP))
|
|
|
525b14a |
goto skip;
|
|
|
525b14a |
+ #endif
|
|
|
525b14a |
}
|
|
|
525b14a |
|
|
|
525b14a |
#ifdef HAVE_SANDBOX
|
|
|
525b14a |
*** ../vim-7.2.107/src/version.c Wed Feb 11 18:46:48 2009
|
|
|
525b14a |
--- src/version.c Wed Feb 11 22:46:40 2009
|
|
|
525b14a |
***************
|
|
|
525b14a |
*** 678,679 ****
|
|
|
525b14a |
--- 678,681 ----
|
|
|
525b14a |
{ /* Add new patch number below this line */
|
|
|
525b14a |
+ /**/
|
|
|
525b14a |
+ 108,
|
|
|
525b14a |
/**/
|
|
|
525b14a |
|
|
|
525b14a |
--
|
|
|
525b14a |
hundred-and-one symptoms of being an internet addict:
|
|
|
525b14a |
80. At parties, you introduce your spouse as your "service provider."
|
|
|
525b14a |
|
|
|
525b14a |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
525b14a |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
525b14a |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
525b14a |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|