From b835e9a23d16f7ff51a5bf9bad3108910e2d7333 Mon Sep 17 00:00:00 2001
From: Johan Walles <johan.walles@gmail.com>
Date: Wed, 15 May 2024 20:34:01 +0200
Subject: [PATCH] Fix the warnings

---
 m/pager.go  |  5 ++++-
 m/search.go | 24 ------------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/m/pager.go b/m/pager.go
index a1ddceb..1c1db9c 100644
--- a/m/pager.go
+++ b/m/pager.go
@@ -446,7 +446,10 @@ func (p *Pager) StartPaging(screen twin.Screen, chromaStyle *chroma.Style, chrom
 			// Do nothing, we don't care about background color updates
 
 		case eventGoToLine:
-			p.scrollPosition = NewScrollPositionFromLineNumber(event.lineNumber, "goToLine")
+			line := NewScrollPositionFromLineNumber(event.lineNumber, "goToLine")
+			if !line.isVisible(p) {
+				p.scrollPosition = line
+			}
 
 		default:
 			log.Warnf("Unhandled event type: %v", event)
diff --git a/m/search.go b/m/search.go
index d61e51b..e5b580f 100644
--- a/m/search.go
+++ b/m/search.go
@@ -6,30 +6,6 @@ import (
 	"github.com/walles/moar/m/linenumbers"
 )
 
-func (p *Pager) scrollToSearchHits() {
-	if p.searchPattern == nil {
-		// This is not a search
-		return
-	}
-
-	firstHitPosition := p.findFirstHit(*p.scrollPosition.lineNumber(p), nil, false)
-	if firstHitPosition == nil {
-		// Try again from the top
-		firstHitPosition = p.findFirstHit(linenumbers.LineNumber{}, p.scrollPosition.lineNumber(p), false)
-	}
-	if firstHitPosition == nil {
-		// No match, give up
-		return
-	}
-
-	if firstHitPosition.isVisible(p) {
-		// Already on-screen, never mind
-		return
-	}
-
-	p.scrollPosition = *firstHitPosition
-}
-
 // NOTE: When we search, we do that by looping over the *input lines*, not
 // the screen lines. That's why we're using a line number rather than a
 // scrollPosition for searching.