From ffc0716af8e448ef8a2a3249edfd0260546933df Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 17 Aug 2019 20:17:51 +0200
Subject: [PATCH] patch 8.1.1877: graduated features scattered

Problem:    Graduated features scattered.
Solution:   Put graduated and obsolete features together.
---
 src/feature.h | 54 +++++++++++++--------------------------------------
 src/version.c |  2 ++
 2 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/src/feature.h b/src/feature.h
index 64689c96d7..a8ae37663d 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -94,15 +94,23 @@
  */
 
 /*
- * These features used to be optional but are now always enabled.
+ * These features used to be optional but are now always enabled:
  * +windows		Multiple windows.  Without this there is no help
  *			window and no status lines.
  * +vertsplit		Vertically split windows.
- */
-
-/*
  * +cmdhist		Command line history.
- *			Now always included.
+ * +localmap		Mappings and abbreviations local to a buffer.
+ * +visual		Visual mode
+ * +visualextra		Extra features for Visual mode (mostly block operators).
+ * +virtualedit		'virtualedit' option and its implementation
+ * +user_commands	Allow the user to define his own commands.
+ * +multi_byte		Generic multi-byte character handling.
+ *
+ * Obsolete:
+ * +tag_old_static	Old style static tags: "file:tag  file  ..".
+ *			Support was removed in 8.1.1093.
+ * +farsi		Farsi (Persian language) Keymap support.
+ *			Removed in patch 8.1.0932
  */
 
 /*
@@ -161,11 +169,6 @@
 # define FEAT_KEYMAP
 #endif
 
-/*
- * +localmap		Mappings and abbreviations local to a buffer.
- *			Now always included.
- */
-
 /*
  * +insert_expand	CTRL-N/CTRL-P/CTRL-X in insert mode. Takes about
  *			4Kbyte of code.
@@ -186,17 +189,6 @@
 # define VIM_BACKTICK		/* internal backtick expansion */
 #endif
 
-/*
- * +visual		Visual mode - now always included.
- * +visualextra		Extra features for Visual mode (mostly block operators).
- *			Now always included.
- */
-
-/*
- * +virtualedit		'virtualedit' option and its implementation
- *			Now always included.
- */
-
 /*
  * +cmdline_info	'showcmd' and 'ruler' options.
  */
@@ -258,11 +250,6 @@
 # define FEAT_RIGHTLEFT
 #endif
 
-/*
- * +farsi		Farsi (Persian language) Keymap support.
- *			Removed in patch 8.1.0932
- */
-
 /*
  * +arabic		Arabic keymap and shaping support.
  *			Requires FEAT_RIGHTLEFT
@@ -299,11 +286,6 @@
 # define FEAT_TAG_BINS
 #endif
 
-/*
- * +tag_old_static	Old style static tags: "file:tag  file  ..".
- *			Support was removed in 8.1.1093.
- */
-
 /*
  * +cscope		Unix only: Cscope support.
  */
@@ -372,11 +354,6 @@
 # define FEAT_COMPL_FUNC
 #endif
 
-/*
- * +user_commands	Allow the user to define his own commands.
- *			Now always enabled.
- */
-
 /*
  * +printer		":hardcopy" command
  * +postscript		Printing uses PostScript file output.
@@ -573,11 +550,6 @@
 # define FEAT_GETTEXT
 #endif
 
-/*
- * +multi_byte		Generic multi-byte character handling.
- *			Now always enabled.
- */
-
 /*
  * +multi_byte_ime	Win32 IME input method.  Only for far-east Windows, so
  *			IME can be used to input chars.  Not tested much!
diff --git a/src/version.c b/src/version.c
index ed8cc6b4e7..b7d09aae6c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1877,
 /**/
     1876,
 /**/
-- 
2.47.3