From ed68467ff068a685739ffdd814b3398312dd28bc Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Mon, 17 Apr 2023 16:59:44 -0230
Subject: [PATCH 1/2] Minor fixes from clang-tidy.

---
 src/emucore/Settings.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 125eadfd3..18e6a9061 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -37,8 +37,8 @@
 //#endif
 
 #if defined(BSPF_UNIX) || defined(BSPF_MACOS)
+#include <cstdio>
 #include <sys/ioctl.h>
-#include <stdio.h>
 #include <unistd.h>
 #endif
 
@@ -843,7 +843,7 @@ void Settings::usage()
     {
       row = 0;
       cout << "Press \"Enter\"" << std::flush;
-      getchar();
+      std::ignore = getchar();
       cout << endl;
     }
     string substr;

From d6655fc9ab972c17dd0932870f4c1a5ae3319469 Mon Sep 17 00:00:00 2001
From: Stefan <stefan.haubenthal@gmail.com>
Date: Thu, 27 Apr 2023 18:20:04 +0200
Subject: [PATCH 2/2] Fixed typos (#966)

Thanks for the PR.
---
 docs/debugger.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/debugger.html b/docs/debugger.html
index 11aa69785..068239884 100644
--- a/docs/debugger.html
+++ b/docs/debugger.html
@@ -311,7 +311,7 @@ more convenient.
   </li>
   <li>
     "&lt;rom_filename&gt;.sym" (located in the same directory as the ROM)</br>
-    If you provied the -l and -s parameters DASM will create these two files during
+    If you provide the -l and -s parameters DASM will create these two files during
     assembly. Stella uses the file content to display the correct labels.
   </li>
 </ul>
@@ -1107,7 +1107,7 @@ VDELBL selects the register that is used to control the ball. This is
 visualized in the debugger in the same way as the two copies of GRP0 and
 GRP1</p>
 
-<p>For many registers, writes don't take effect immediatelly as the
+<p>For many registers, writes don't take effect immediately as the
 TIA takes some color clocks to change state. In Stella's TIA core, this
 is implemented by queueing the writes, and the contents of this queue
 are visualized in the debugger in the "Queued Writes" area of the TIA tab.</p>
@@ -1594,7 +1594,7 @@ disassembly line's address and bank</li>
 isn't already a defined label).</li>
 
 <li><b>Show GFX as binary</b>: Switch between displaying/editing GFX and PGFX sections
-in either binary or hexidecimal.</li>
+in either binary or hexadecimal.</li>
 
 <li><b>Use address relocation</b>: Corresponds to the DiStella '-r' option
 (Relocate calls out of address range).</br>