From 65c54427192bc5afb915e06253246721c8c21f5e Mon Sep 17 00:00:00 2001
From: Jim Diamond <zlists+github@jdvb.ca>
Date: Mon, 3 Nov 2025 10:58:50 -0400
Subject: [PATCH 1/2] Fix bug in buildFiles2.c

---
 src/builderFiles2.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/builderFiles2.cpp b/src/builderFiles2.cpp
index 5ed5fa3..84fdf89 100644
--- a/src/builderFiles2.cpp
+++ b/src/builderFiles2.cpp
@@ -491,13 +491,13 @@ void XxBuilderFiles2::createIgnoreBlock(
          ++ii1;
          ++ii2;
       }
-      else if ( filled2 ) {
+      else if ( filled1 ) { // BUG BUG BUG was filled2... now fixed
          XxLine line( XxLine::SAME, ii1, -1 );
          line.setHunkId( _curHunk );
          addLine( line );
          ++ii1;
       }
-      else if ( filled1 ) {
+      else if ( filled2 ) { // BUG BUG BUG was filled1... now fixed
          XxLine line( XxLine::SAME, -1, ii2 );
          line.setHunkId( _curHunk );
          addLine( line );

From e6e8832afae0f2e76d88ff4790af495b1e4c7935 Mon Sep 17 00:00:00 2001
From: Jim Diamond <zlists+github@jdvb.ca>
Date: Tue, 4 Nov 2025 15:40:54 -0400
Subject: [PATCH 2/2] Fix "JumpToFirstDiff" bug where it would jump to the
 second diff if the first diff started on line 1.

---
 src/app.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app.cpp b/src/app.cpp
index 36eea4f..2cc8d3c 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -492,9 +492,12 @@ XxApp::XxApp( int& argc, char** argv, XxCmdline& cmdline ) :
       _mainWindow->raise();
 #endif
 
-      if (cmdline._jumpToFirstDiff
+      if ((cmdline._jumpToFirstDiff
  	  || _resources->getBoolOpt( BOOL_JUMP_TO_FIRST_DIFF ))
- 	  nextDifference();
+	  && _diffs->findNextDifference(0) > 1)
+      {
+	  nextDifference();
+      }
    }
 }