diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2009-08-26 10:00:38 -0500 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:41:17 +0200 |
commit | 5a12e7c134274dba706667107d10d231517d3e05 (patch) | |
tree | 55718d5acb710fde798d9f38d0bbaf594ed4b296 /source/ap/vim/patches/7.2.105 | |
download | current-5a12e7c134274dba706667107d10d231517d3e05.tar.gz current-5a12e7c134274dba706667107d10d231517d3e05.tar.xz |
Slackware 13.0slackware-13.0
Wed Aug 26 10:00:38 CDT 2009
Slackware 13.0 x86_64 is released as stable! Thanks to everyone who
helped make this release possible -- see the RELEASE_NOTES for the
credits. The ISOs are off to the replicator. This time it will be a
6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We're taking pre-orders now at store.slackware.com. Please consider
picking up a copy to help support the project. Once again, thanks to
the entire Slackware community for all the help testing and fixing
things and offering suggestions during this development cycle.
As always, have fun and enjoy! -P.
Diffstat (limited to 'source/ap/vim/patches/7.2.105')
-rw-r--r-- | source/ap/vim/patches/7.2.105 | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/source/ap/vim/patches/7.2.105 b/source/ap/vim/patches/7.2.105 new file mode 100644 index 000000000..486ffb3fc --- /dev/null +++ b/source/ap/vim/patches/7.2.105 @@ -0,0 +1,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 /// |