From 811cb036d95224989c8d027618a6424dc27e0ad6 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Wed, 24 Dec 2014 14:30:05 +0100
Subject: 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
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/version.c')

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,
-- 
cgit