From f69d9a354b62ced91e99c0004706bebca7c2d96d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 11 Feb 2009 21:48:40 +0000
Subject: [PATCH] updated for version 7.2-108

---
 src/option.c  | 2 ++
 src/version.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/option.c b/src/option.c
index 5c78269d8..bd12b8bad 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4127,6 +4127,7 @@ do_set(arg, opt_flags)
 		    errmsg = (char_u *)_("E520: Not allowed in a modeline");
 		    goto skip;
 		}
+#ifdef FEAT_DIFF
 		/* In diff mode some options are overruled.  This avoids that
 		 * 'foldmethod' becomes "marker" instead of "diff" and that
 		 * "wrap" gets set. */
@@ -4134,6 +4135,7 @@ do_set(arg, opt_flags)
 			&& (options[opt_idx].indir == PV_FDM
 			    || options[opt_idx].indir == PV_WRAP))
 		    goto skip;
+#endif
 	    }
 
 #ifdef HAVE_SANDBOX
diff --git a/src/version.c b/src/version.c
index 04dbca663..7a8378860 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    108,
 /**/
     107,
 /**/
-- 
2.50.1