From 3244d4bd29281aa71bd9afe9151b7dcc960554e9 Mon Sep 17 00:00:00 2001
From: Allan Odgaard <git@abetarda.com>
Date: Fri, 4 Oct 2013 21:55:38 +0200
Subject: [PATCH] Fix re-indented paste with a zig-zap selection

---
 Frameworks/editor/src/editor.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Frameworks/editor/src/editor.cc b/Frameworks/editor/src/editor.cc
index 3b1ff526..821432b0 100644
--- a/Frameworks/editor/src/editor.cc
+++ b/Frameworks/editor/src/editor.cc
@@ -547,7 +547,9 @@ namespace ng
 					str = indent + str;
 				if(complete)
 				{
-					std::string const& rightOfCaret = buffer.substr(index, buffer.eol(line));
+					size_t const rightIndex = selections.last().max().index;
+					size_t const lastLine  = buffer.convert(rightIndex).line;
+					std::string const& rightOfCaret = buffer.substr(rightIndex, buffer.eol(lastLine));
 					if(!text::is_blank(rightOfCaret.data(), rightOfCaret.data() + rightOfCaret.size()))
 						str += '\n';
 				}