diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-24 14:30:05 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-24 23:29:00 +0100 |
| commit | 811cb036d95224989c8d027618a6424dc27e0ad6 (patch) | |
| tree | 079db5920345a756cb861b175334e1f17192c9d1 /src | |
| parent | 476a2c0a83304c069b90e0110a5c67c8953aab18 (diff) | |
| download | rneovim-811cb036d95224989c8d027618a6424dc27e0ad6.tar.gz rneovim-811cb036d95224989c8d027618a6424dc27e0ad6.tar.bz2 rneovim-811cb036d95224989c8d027618a6424dc27e0ad6.zip | |
vim-patch:7.4.538
Problem: Tests fail with small features plus Python.
Solution: Disallow weird combination of options. Do not set "fdm" when
folding is disabled.
https://code.google.com/p/vim/source/detail?r=v7-4-538
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 1bab0da79a..1c07bef3e3 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3645,6 +3645,7 @@ set_string_option_direct ( idx = findoption(name); if (idx < 0) { /* not found (should not happen) */ EMSG2(_(e_intern2), "set_string_option_direct()"); + EMSG2(_("For option %s"), name); return; } } diff --git a/src/nvim/version.c b/src/nvim/version.c index b7b50e9e9c..9c0188e416 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -200,7 +200,7 @@ static int included_patches[] = { //541, //540 NA //539, - //538, + 538, //537, 536, //535, |