From 564e6de86324aec3079e3bb634db0807dd16987e Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Tue, 28 May 2024 20:25:18 -0700
Subject: [PATCH] Fixed issue with caret starting line

---
 gui/notepad/src/notepad.tal | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gui/notepad/src/notepad.tal b/gui/notepad/src/notepad.tal
index 983395d..a8c9f2d 100644
--- a/gui/notepad/src/notepad.tal
+++ b/gui/notepad/src/notepad.tal
@@ -330,9 +330,9 @@
 	DUP2 find-line-start
 	( tab line ) LDA2k #093e NEQ2 ?{ POP2 #01 #0021 !<draw-linebreak> }
 	( tab caret ) LDA2k #092d NEQ2 ?{ POP2 #01 #0022 !<draw-linebreak> }
-	#0001 SUB2
-	( lb line ) LDA2k #0a3e NEQ2 ?{ POP2 #01 #0011 !<draw-linebreak> }
-	( lb caret ) LDA2k #0a2d NEQ2 ?{ POP2 #01 #0012 !<draw-linebreak> }
+	#0001 SUB2 LDA2 SWP #20 LTH SWP
+	( lb line ) DUP2 #013e NEQ2 ?{ POP2 #01 #0011 !<draw-linebreak> }
+	( lb caret ) DUP2 #012d NEQ2 ?{ POP2 #01 #0012 !<draw-linebreak> }
 	POP2 #01 #0008 !<draw-linebreak>
 	&no-wrap ( char )
 	LDAk char-width .Screen/x DEI2 ADD2 .Screen/x DEO2
@@ -348,11 +348,10 @@
 @char-addr ( prev char -- addr* )
 	DUP #7e GTH ?&missing
 	DUP #20 LTH ?&blank
-	DUP2 #093e EQU2 ?&marker
-	DUP2 #092d EQU2 ?&bullet
-	DUP2 #0a3e EQU2 ?&marker
-	DUP2 #0a2d EQU2 ?&bullet
-	NIP #20 SUB #00 SWP #50 SFT2 ;font/glyphs ADD2 JMP2r
+	SWP #20 LTH
+	( - ) DUP2 #3e01 EQU2 ?&marker
+	( > ) DUP2 #2d01 EQU2 ?&bullet
+	POP #20 SUB #00 SWP #50 SFT2 ;font/glyphs ADD2 JMP2r
 	&blank POP2 ;font/glyphs JMP2r
 	&missing POP2 ;error-icn JMP2r
 	&marker POP2 ;marker-icn JMP2r