From 09821d98f8e12ac87128326c05e5110f9336ad06 Mon Sep 17 00:00:00 2001
From: Foo <kp-pav@yandex.ru>
Date: Mon, 6 Feb 2017 16:46:21 +0300
Subject: [PATCH] Add support for new Vim modes

Fixes #1715
---
 powerline/config_files/themes/ascii.json       |  4 ++++
 powerline/config_files/themes/powerline.json   |  4 ++++
 .../themes/powerline_terminus.json             |  4 ++++
 .../themes/powerline_unicode7.json             |  4 ++++
 powerline/config_files/themes/unicode.json     |  4 ++++
 .../config_files/themes/unicode_terminus.json  |  4 ++++
 .../themes/unicode_terminus_condensed.json     |  4 ++++
 powerline/segments/vim/__init__.py             | 18 +++++++++++-------
 8 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/powerline/config_files/themes/ascii.json b/powerline/config_files/themes/ascii.json
index c6760613..1012a56d 100644
--- a/powerline/config_files/themes/ascii.json
+++ b/powerline/config_files/themes/ascii.json
@@ -105,8 +105,12 @@
 					"S":  "S-LINE",
 					"^S": "S-BLCK",
 					"i":  "INSERT",
+					"ic": "I-COMP",
+					"ix": "I-C_X ",
 					"R":  "RPLACE",
 					"Rv": "V-RPLC",
+					"Rc": "R-COMP",
+					"Rx": "R-C_X ",
 					"c":  "COMMND",
 					"cv": "VIM-EX",
 					"ce": "NRM-EX",
diff --git a/powerline/config_files/themes/powerline.json b/powerline/config_files/themes/powerline.json
index 8eb208ad..b0120b14 100644
--- a/powerline/config_files/themes/powerline.json
+++ b/powerline/config_files/themes/powerline.json
@@ -103,8 +103,12 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
+					"ic": "I·COMP",
+					"ix": "I·C-X ",
 					"R":  "RPLACE",
 					"Rv": "V·RPLC",
+					"Rc": "R·COMP",
+					"Rx": "R·C-X ",
 					"c":  "COMMND",
 					"cv": "VIM·EX",
 					"ce": "NRM·EX",
diff --git a/powerline/config_files/themes/powerline_terminus.json b/powerline/config_files/themes/powerline_terminus.json
index caef6db3..5481ca4a 100644
--- a/powerline/config_files/themes/powerline_terminus.json
+++ b/powerline/config_files/themes/powerline_terminus.json
@@ -103,8 +103,12 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
+					"ic": "I·COMP",
+					"ix": "I·C-X ",
 					"R":  "RPLACE",
 					"Rv": "V·RPLC",
+					"Rc": "R·COMP",
+					"Rx": "R·C-X ",
 					"c":  "COMMND",
 					"cv": "VIM·EX",
 					"ce": "NRM·EX",
diff --git a/powerline/config_files/themes/powerline_unicode7.json b/powerline/config_files/themes/powerline_unicode7.json
index 5411fd38..023eb43d 100644
--- a/powerline/config_files/themes/powerline_unicode7.json
+++ b/powerline/config_files/themes/powerline_unicode7.json
@@ -117,8 +117,12 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
+					"ic": "I·COMP",
+					"ix": "I·C-X ",
 					"R":  "RPLACE",
 					"Rv": "V·RPLC",
+					"Rc": "R·COMP",
+					"Rx": "R·C-X ",
 					"c":  "COMMND",
 					"cv": "VIM·EX",
 					"ce": "NRM·EX",
diff --git a/powerline/config_files/themes/unicode.json b/powerline/config_files/themes/unicode.json
index 6c183a69..33d96346 100644
--- a/powerline/config_files/themes/unicode.json
+++ b/powerline/config_files/themes/unicode.json
@@ -103,8 +103,12 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
+					"ic": "I·COMP",
+					"ix": "I·C-X ",
 					"R":  "RPLACE",
 					"Rv": "V·RPLC",
+					"Rc": "R·COMP",
+					"Rx": "R·C-X ",
 					"c":  "COMMND",
 					"cv": "VIM·EX",
 					"ce": "NRM·EX",
diff --git a/powerline/config_files/themes/unicode_terminus.json b/powerline/config_files/themes/unicode_terminus.json
index 47320529..b0e51bd1 100644
--- a/powerline/config_files/themes/unicode_terminus.json
+++ b/powerline/config_files/themes/unicode_terminus.json
@@ -103,8 +103,12 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
+					"ic": "I·COMP",
+					"ix": "I·C-X ",
 					"R":  "RPLACE",
 					"Rv": "V·RPLC",
+					"Rc": "R·COMP",
+					"Rx": "R·C-X ",
 					"c":  "COMMND",
 					"cv": "VIM·EX",
 					"ce": "NRM·EX",
diff --git a/powerline/config_files/themes/unicode_terminus_condensed.json b/powerline/config_files/themes/unicode_terminus_condensed.json
index ddd75876..421f5c88 100644
--- a/powerline/config_files/themes/unicode_terminus_condensed.json
+++ b/powerline/config_files/themes/unicode_terminus_condensed.json
@@ -104,8 +104,12 @@
 					"S":  "SLN",
 					"^S": "SBL",
 					"i":  "INS",
+					"ic": "I-C",
+					"ix": "I^X",
 					"R":  "REP",
 					"Rv": "VRP",
+					"Rc": "R-C",
+					"Rx": "R^X",
 					"c":  "CMD",
 					"cv": "VEX",
 					"ce": " EX",
diff --git a/powerline/segments/vim/__init__.py b/powerline/segments/vim/__init__.py
index 9d054410..f89b9659 100644
--- a/powerline/segments/vim/__init__.py
+++ b/powerline/segments/vim/__init__.py
@@ -50,15 +50,19 @@ vim_modes = {
 	'S': 'S-LINE',
 	'^S': 'S-BLCK',
 	'i': 'INSERT',
-	'R': 'REPLACE',
-	'Rv': 'V-RPLCE',
+	'ic': 'I-COMP',
+	'ix': 'I-C_X ',
+	'R': 'RPLACE',
+	'Rv': 'V-RPLC',
+	'Rc': 'R-COMP',
+	'Rx': 'R-C_X ',
 	'c': 'COMMND',
-	'cv': 'VIM EX',
-	'ce': 'EX',
+	'cv': 'VIM-EX',
+	'ce': 'NRM-EX',
 	'r': 'PROMPT',
-	'rm': 'MORE',
-	'r?': 'CONFIRM',
-	'!': 'SHELL',
+	'rm': '-MORE-',
+	'r?': 'CNFIRM',
+	'!': '!SHELL',
 }