From eb7189dcdbb4e4cdee64f2a8916a7bd67a68640c Mon Sep 17 00:00:00 2001
From: Zachary Yedidia <zyedidia@gmail.com>
Date: Tue, 21 Apr 2020 09:33:21 -0400
Subject: [PATCH] Make cursor follow selections

Fixes #1624
---
 internal/action/command.go    | 1 +
 internal/display/bufwindow.go | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/internal/action/command.go b/internal/action/command.go
index 3fdd30a7..78508023 100644
--- a/internal/action/command.go
+++ b/internal/action/command.go
@@ -761,6 +761,7 @@ func (h *BufPane) ReplaceCmd(args []string) {
 
 			h.Cursor.SetSelectionStart(locs[0])
 			h.Cursor.SetSelectionEnd(locs[1])
+			h.Cursor.GotoLoc(locs[0])
 
 			h.Relocate()
 
diff --git a/internal/display/bufwindow.go b/internal/display/bufwindow.go
index 34e23dfa..a33875f3 100644
--- a/internal/display/bufwindow.go
+++ b/internal/display/bufwindow.go
@@ -139,9 +139,6 @@ func (w *BufWindow) Relocate() bool {
 	ret := false
 	activeC := w.Buf.GetActiveCursor()
 	cy := activeC.Y
-	if activeC.HasSelection() {
-		cy = activeC.CurSelection[0].Y
-	}
 	scrollmargin := int(b.Settings["scrollmargin"].(float64))
 	if cy < w.StartLine+scrollmargin && cy > scrollmargin-1 {
 		w.StartLine = cy - scrollmargin