From c68fde7bebfbdcee2a44b757f3d887507edf3eba Mon Sep 17 00:00:00 2001
From: Emil Petersen <epetersen@celltrak.com>
Date: Fri, 5 Apr 2019 18:17:13 -0400
Subject: [PATCH] Apply conventions to multi-term keybinds

---
 CHANGELOG.develop               |  4 ++++
 layers/+tools/shell/README.org  | 14 ++++++++------
 layers/+tools/shell/packages.el |  7 +++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 639c49d91..2a6bef675 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -2008,6 +2008,10 @@ Other:
 - Wrap 'shell' command to start in current buffer (thanks to Valts Liepiņš)
 - Fixed shell popup broken on macOS (thanks to Daniel Rivas Perez)
 - Fixed broken leader key binding for inferior shell (thanks to Valts Liepiņš)
+- Added =term-mode= bindings (Thanks to Emil Petersen):
+  - ~SPC m C~ switch multi-term to char mode
+  - ~SPC m l~ switch multi-term to line mode
+  - ~SPC m N~ go to previous multi-term
 **** Shell Scripts
 - Added new company-shell environment variable backend (thanks to
   Alexander-Miller)
diff --git a/layers/+tools/shell/README.org b/layers/+tools/shell/README.org
index ebedf67ba..0a7b19d3b 100644
--- a/layers/+tools/shell/README.org
+++ b/layers/+tools/shell/README.org
@@ -221,12 +221,14 @@ in the current buffer instead of a popup.
 
 ** Multi-term
 
-| Key binding | Description                  |
-|-------------+------------------------------|
-| ~SPC m c~   | create a new multi-term      |
-| ~SPC m n~   | go to next multi-term        |
-| ~SPC m p~   | go to previous multi-term    |
-| ~SPC p $ t~ | run multi-term shell in root |
+| Key binding            | Description                    |
+|------------------------+--------------------------------|
+| ~SPC m c~              | create a new multi-term        |
+| ~SPC m C~              | switch multi-term char mode    |
+| ~SPC m l~              | switch multi-term to line mode |
+| ~SPC m n~              | go to next multi-term          |
+| ~SPC m N~ or ~SPC m p~ | go to previous multi-term      |
+| ~SPC p $ t~            | run multi-term shell in root   |
 
 ** Eshell
 
diff --git a/layers/+tools/shell/packages.el b/layers/+tools/shell/packages.el
index dc1838087..6c6bea526 100644
--- a/layers/+tools/shell/packages.el
+++ b/layers/+tools/shell/packages.el
@@ -165,8 +165,11 @@
       ;; multi-term commands to create terminals and move through them.
       (spacemacs/set-leader-keys-for-major-mode 'term-mode
         "c" 'multi-term
-        "p" 'multi-term-prev
-        "n" 'multi-term-next))))
+        "C" 'term-char-mode
+        "l" 'term-line-mode
+        "n" 'multi-term-next
+        "N" 'multi-term-prev
+        "p" 'multi-term-prev))))
 
 (defun shell/pre-init-org ()
   (spacemacs|use-package-add-hook org