Make cursor follow selections

Fixes #1624

diff --git a/internal/action/command.go b/internal/action/command.go
index 3fdd30a7deb4f805c525ad6a51a494cecaa8bc06..78508023de5660f9e09074641cc21adf3a51d313 100644 (file)
--- 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 34e23dfacf7b48955dc57e099e6ef647a43a7135..a33875f3fa0cdf9f4206261a68844a4ac8b5dbd4 100644 (file)
--- 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