From 211ce0185ca6685695be4a51a34fa9eb62c5655b Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Wed, 18 Jan 2017 22:00:57 -0500
Subject: [PATCH] pass \n to BufferPane when inserting a newline

---
 src/gui/BufferPane.cc | 3 +--
 src/gui/Window.cc     | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/BufferPane.cc b/src/gui/BufferPane.cc
index 995e3f7..43d853c 100644
--- a/src/gui/BufferPane.cc
+++ b/src/gui/BufferPane.cc
@@ -461,9 +461,8 @@ void BufferPane::insert_code_point(uint32_t code_point)
         }
         else
         {
-            if (code_point == '\r')
+            if (code_point == '\n')
             {
-                code_point = '\n';
                 m_cursor_screen_row++;
             }
             m_buffer->insert_code_point(*m_iterator, code_point);
diff --git a/src/gui/Window.cc b/src/gui/Window.cc
index cf2bee8..5cd955b 100644
--- a/src/gui/Window.cc
+++ b/src/gui/Window.cc
@@ -415,11 +415,12 @@ uint32_t Window::get_keyval(SDL_Keycode keysym)
     }
     switch (keyval)
     {
+    case SDLK_RETURN: keyval = '\n'; break;
     case SDLK_KP_DIVIDE: keyval = '/'; break;
     case SDLK_KP_MULTIPLY: keyval = '*'; break;
     case SDLK_KP_MINUS: keyval = '-'; break;
     case SDLK_KP_PLUS: keyval = '+'; break;
-    case SDLK_KP_ENTER: keyval = SDLK_RETURN; break;
+    case SDLK_KP_ENTER: keyval = '\n'; break;
     case SDLK_KP_1: keyval = '1'; break;
     case SDLK_KP_2: keyval = '2'; break;
     case SDLK_KP_3: keyval = '3'; break;