From 29a896f9d83fb3e83324da703faa48375989719f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 23 Mar 2023 10:28:56 +0530
Subject: [PATCH] ...

---
 tools/cmd/diff/highlight.go | 2 +-
 tools/cmd/diff/ui.go        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cmd/diff/highlight.go b/tools/cmd/diff/highlight.go
index cdfb1d086..1c3c41784 100644
--- a/tools/cmd/diff/highlight.go
+++ b/tools/cmd/diff/highlight.go
@@ -95,7 +95,7 @@ func ansi_formatter(w io.Writer, style *chroma.Style, it chroma.Iterator) error
 		if !entry.IsZero() {
 			if entry.Bold == chroma.Yes {
 				before = append(before, '1', ';')
-				after = append(after, '2', '2', ';')
+				after = append(after, '2', '2', '1', ';')
 			}
 			if entry.Underline == chroma.Yes {
 				before = append(before, '4', ';')
diff --git a/tools/cmd/diff/ui.go b/tools/cmd/diff/ui.go
index a48dbd35a..12d0c01ca 100644
--- a/tools/cmd/diff/ui.go
+++ b/tools/cmd/diff/ui.go
@@ -414,7 +414,7 @@ func (self *Handler) scroll_to_next_match(backwards, include_current_match bool)
 		delta *= -1
 	}
 	pos := self.scroll_pos
-	if self.logical_lines.IncrementScrollPosBy(&pos, offset) == 0 {
+	if offset != 0 && self.logical_lines.IncrementScrollPosBy(&pos, offset) == 0 {
 		return false
 	}
 	for {