From fcf9dc839373b3c39eebafa2eb223d5fb39bb71e Mon Sep 17 00:00:00 2001
From: Mike Lowis <mike.lowis@gentex.com>
Date: Wed, 19 Oct 2016 09:45:27 -0400
Subject: [PATCH] reverted poorly conceived updates to key handling

---
 keyboard.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/keyboard.c b/keyboard.c
index 12a93c5..598537f 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -44,10 +44,6 @@ static void backspace(void) {
     TargetCol = buf_getcol(&Buffer, CursorPos);
 }
 
-static void insert(Rune r) {
-    buf_ins(&Buffer, CursorPos++, r);
-}
-
 static void delete(void) {
     buf_del(&Buffer, CursorPos);
 }
@@ -73,6 +69,11 @@ static void quit(void) {
     exit(0);
 }
 
+static void insert(Rune r) {
+    buf_ins(&Buffer, CursorPos++, r);
+    TargetCol = buf_getcol(&Buffer, CursorPos);
+}
+
 /*****************************************************************************/
 
 typedef struct {
@@ -80,7 +81,7 @@ typedef struct {
     void (*action)(void);
 } KeyBinding_T;
 
-KeyBinding_T Specials[] = {
+static KeyBinding_T Specials[] = {
     { KEY_F6,     toggle_colors },
     { KEY_UP,     cursor_up     },
     { KEY_DOWN,   cursor_dn     },
@@ -94,7 +95,7 @@ KeyBinding_T Specials[] = {
     { 0,          NULL          }
 };
 
-KeyBinding_T Controls[] = {
+static KeyBinding_T Controls[] = {
     { KEY_ESCAPE,    exit_insert },
     { KEY_BACKSPACE, backspace   },
     { KEY_CTRL_W,    write       },
@@ -102,7 +103,9 @@ KeyBinding_T Controls[] = {
     { 0,             NULL        }
 };
 
-KeyBinding_T ViKeys[] = {
+static KeyBinding_T ViKeys[] = {
+    { 'q', quit          },
+    { 's', write         },
     { 'a', insert_after  },
     { 'i', insert_before },
     { 'k', cursor_up     },
-- 
2.49.0