From aa7241067e49784071b379f88b365e9fc831d0d2 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Wed, 25 Jan 2017 13:36:06 +0000
Subject: [PATCH] Only restore cursor position after an append if we still have
 cursor > anchor

Fixes #1158
---
 src/input_handler.cc | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/input_handler.cc b/src/input_handler.cc
index 5347da440..9a39ef9e3 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -988,7 +988,7 @@ class Insert : public InputMode
 public:
     Insert(InputHandler& input_handler, InsertMode mode, int count)
         : InputMode(input_handler),
-          m_insert_mode(mode),
+          m_restore_cursor(mode == InsertMode::Append),
           m_edition(context()),
           m_completer(context()),
           m_autoshowcompl(true),
@@ -1003,7 +1003,7 @@ public:
         last_insert().keys.clear();
         last_insert().disable_hooks = context().hooks_disabled();
         context().hooks().run_hook("InsertBegin", "", context());
-        prepare(m_insert_mode, count);
+        prepare(mode, count);
 
         if (context().has_client() and
             context().options()["readonly"].get<bool>())
@@ -1014,10 +1014,13 @@ public:
     ~Insert() override
     {
         auto& selections = context().selections();
-        for (auto& sel : selections)
+        if (m_restore_cursor)
         {
-            if (m_insert_mode == InsertMode::Append and sel.cursor().column > 0)
-                sel.cursor() = context().buffer().char_prev(sel.cursor());
+            for (auto& sel : selections)
+            {
+                if (sel.cursor() > sel.anchor() and sel.cursor().column > 0)
+                    sel.cursor() = context().buffer().char_prev(sel.cursor());
+            }
         }
         selections.avoid_eol();
     }
@@ -1299,13 +1302,13 @@ private:
         buffer.check_invariant();
     }
 
-    InsertMode       m_insert_mode;
-    ScopedEdition    m_edition;
-    InsertCompleter  m_completer;
-    bool             m_autoshowcompl;
-    Timer            m_idle_timer;
-    bool             m_in_end = false;
-    MouseHandler     m_mouse_handler;
+    ScopedEdition   m_edition;
+    InsertCompleter m_completer;
+    bool            m_restore_cursor;
+    bool            m_autoshowcompl;
+    Timer           m_idle_timer;
+    bool            m_in_end = false;
+    MouseHandler    m_mouse_handler;
 };
 
 }