From fa79e3d8a64c728b15a2f61232a9177ba9c3e707 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Tue, 5 May 2020 15:49:50 -0400
Subject: [PATCH] Make (print) stop on CR

Lines edited with the Block editor end with 0xd and (print) spits
spurious CR when printing those lines.

Also, properly initialize ACC in BROWSE.
---
 blk/060        |   2 +-
 blk/102        |   3 ++-
 blk/438        |   8 ++++----
 emul/forth.bin | Bin 5729 -> 5739 bytes
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/blk/060 b/blk/060
index 25b341f..2fa1807 100644
--- a/blk/060
+++ b/blk/060
@@ -4,7 +4,7 @@ I/O
                   result in n as well as whether parsing was a
                   success in f (false = failure, true =
                   success)
-(print)  a --     Print string at addr a.
+(print)  a --     Print string at addr a. Stops at 0x0 or 0xd.
 .        n --     Print n in its decimal form
 .x       n --     Print n's LSB in hex form. Always 2
                   characters.
diff --git a/blk/102 b/blk/102
index fabf2da..210a603 100644
--- a/blk/102
+++ b/blk/102
@@ -2,7 +2,8 @@
 1 5 LOADR+
 
 : BROWSE
-    L BEGIN
+    0 ACC ! L
+    BEGIN
         KEY CASE
             'Q' OF EXIT ENDOF
             'B' OF B ENDOF
diff --git a/blk/438 b/blk/438
index 0da95a7..1fe79e5 100644
--- a/blk/438
+++ b/blk/438
@@ -4,10 +4,10 @@
 
 : (print)
     BEGIN
-    C@+      ( a+1 c )
-    ( exit if null )
-    DUP NOT IF 2DROP EXIT THEN
-    EMIT     ( a )
+        C@+      ( a+1 c )
+        ( exit if null or 0xd )
+        DUP 13 = OVER NOT OR IF 2DROP EXIT THEN
+        EMIT     ( a )
     AGAIN
 ;
 
diff --git a/emul/forth.bin b/emul/forth.bin
index c93de2618fd372b6cfc1bdb2b237099b105cc5f6..c928a49a17d46b2807d5dafa0738db5fc96fc286 100644
GIT binary patch
delta 901
zcmXw%Ur19?9LIm>-aFH|-E;5mowlNO)gfE12}TK$rngI^O(&ZUN2HLTgfWeTKnO*o
zUZRF4Sng#|4+F>O55}OE9(*!<@I`tsiXbS8ULpd6xc!cs59b`dzdxVz`~A-O9R3lm
z+gyXqHvlm6vTj@U8{mdP#}-)@lEO69K%-znQBJ@Y+k|j)3;QmIe1GHt=~it3cH~s8
z34LZPKGJ*~?#T@-Os|Q{be=t+5oMK{5WJI~3K`&#cjP>KM-6A5HpA=;W|r7*ni3oe
ziz$9$v00@jvZNGczD$UW`9P2j0J0~nE9;606EYAvM-1q~YI0;<$+JDh=itsf+gJKe
zl<+odba41CNb)@0B1vh?aajL*Hlg-SJXTHU9|}4_M6v)C8FHaqQ6EZN25+RNZiXn-
zV1FBGjucc|u(5x%U%wslqP?I}aYG$MvIHh@wJ7nZJe^{;+V16+%>%y^3~)jM<2>x5
z=Pdn+d`_gIEhMD^yYKOz+f_R~%Q)q~_B`ECImd*!6&*T%3@64z+r=E21{Yw0`mLVB
zo_h-HgQu0Qs0OO6Q19AR1F+3ht#i0bGr^2rX*%V?blzgs(BsCL@bId(MpC>-17Ejl
z305L%4|Ry^411!57MC<zn3U4ESKuM^q%|sz<60mC68D>MDLR_Cd=#%;LNg!E$4V`|
zDu(ZCIl@!;*lM6i_#ikic7Uj0n_4kBS*1lf>hbycYdcx5e&kG^TKEN`{fUuA#JP0?
z6c~`oWK~=hC&f9*((}}SUYHciLPpC9{C6$r9VE?4dJA>y8O?wQypU`m0Bh`%eu21|
z-+MC7i^>YGb!5l-thj<D%pvv=oFkS}qObK1_cZ*npNd7oS2eh;4M$i3ln=Vg3T2XF
tkG$<9!`^zkasTH%t-sO&@XQ;-ZUgYuJB}yOSWkn`S)y0#@LP8S`48q^)x7`!

delta 873
zcmX|9T}TvB6h8OP__OOecka$krjm`@B0HgL2q`RSHff}-KeVeT6=IsAnF<S*LI@E{
z^ibqwTU=O>BnbDVo|bydC$Yc>-=c>IqA2Pm2nyQHb+w1N!*_nZd(L;iuk|15U7M@0
z`3e9=U%1|A<{df-#ZW;V$ZApeo_C<$UnzcSHu)xMSOxKjW_Crn#iqq$7SiuA2ZA?e
zCu|Ffv>h!ecA4c)GC#~+haGKQ{AI)R4->=sQ4$u5dRt^c&ua2>AT(47RI>ocJG!Q?
z=?;u&K(sWmAdGjX$(o*I7O2pz=E#b&qNE8^3gtP>VOA)->&QAz&@s@{e;ZV7nr)Fm
zb*SiIgSTRepBcH&9q8%}x<SF)C={UWLAb;ps1gRJW+!HB2E|&py1~;V!}Bzc3Sj(d
z+%_?u;Y``!J;<zr0}?H(vMR|g3zxUil#!Qvc{f<#hA7sRiXQJt_7V9dBUAEpP|b)(
z-lNUiyumAV{+*v@8(i`@aIquOd#Vaml%<Wh>?C*q8~EokN%qv65udzuY>7)rQnbvo
z%>(dSR2wb*CkzLi$c5VD9&DE@?g!e+Q4?9dk2_++az_i_cRvy=RFocITjGRxV%W<I
zMxKtT<9HUxZOn`tOo`#QM7mX(ci>!PAbS2VUb}!{Db8+TmUfQiKa4byEmF2($Py`p
zB<$RyDA3l{Ve{ZVTd1iFEg>D?4ugC~6_PBB&WLnHV-?7#_$<)>8)8hESHnJOl6DwV
zax`J2s5ISOUlSP@Io~m+_!5Q%A$YFlX#gIIFTT@65w=-VBIioctmrkXio*Ij%ZeLj
zH7`VSdsC-qj`WFDvymjkmf4DD$)SdpXGQ>4%}(4R0PoEh{(pJ>FcM#kL%GWjXXj>S
UM(5+#tiGu9KfB~YTekxF2L&(5*8l(j