From f90216bf046bb74ed1d356cc94abc375b980b192 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Thu, 9 Oct 2008 10:37:43 +0000
Subject: [PATCH] CONFIG_CBM1_PATCHES

---
 make.sh   |  2 +-
 msbasic.s | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/make.sh b/make.sh
index e85bf20..610a605 100755
--- a/make.sh
+++ b/make.sh
@@ -1,6 +1,6 @@
 # 1.0
 echo cbmbasic1
-ca65 -D CBM -D CBM1 -D CBM_KBD msbasic.s -o cbmbasic1.o &&
+ca65 -D CBM -D CBM1 -D CBM_KBD -D CONFIG_CBM1_PATCHES msbasic.s -o cbmbasic1.o &&
 ld65 -C cbmbasic1.cfg cbmbasic1.o -o cbmbasic1-new.bin && 
 xxd -g 1 cbmbasic1.bin > cbmbasic1.bin.txt
 xxd -g 1 cbmbasic1-new.bin > cbmbasic1-new.bin.txt
diff --git a/msbasic.s b/msbasic.s
index 0cf81fe..aa6453a 100644
--- a/msbasic.s
+++ b/msbasic.s
@@ -2264,7 +2264,7 @@ LCA64:
         bcc     L2A4E
 .endif
 LCA6A:
-.ifdef CBM1
+.ifdef CONFIG_CBM1_PATCHES
         lda     Z03
         jsr     PATCH6
         nop
@@ -2322,7 +2322,7 @@ L2A59:
         bne     L2A67
 L2A63:
 .endif
-.ifdef CBM1
+.ifdef CONFIG_CBM1_PATCHES
         jsr     PATCH5
 		nop
 .else
@@ -2437,11 +2437,11 @@ LCB0C:
 .ifdef CBM
         lda     Z03
         bne     LCAF8
-.ifdef CBM2
+.ifdef CONFIG_CBM1_PATCHES
+        jmp     PATCH1
+.else
         clc
         jmp     CONTROL_C_TYPED
-.else
-        jmp     PATCH1
 .endif
 NXIN:
         lda     Z03
@@ -2530,7 +2530,7 @@ INSTART:
 .ifndef OSI_KBD
         bit     INPUTFLG
         bvc     L2B10
-.ifdef CBM1
+.ifdef CONFIG_CBM1_PATCHES
         lda     #$00
         jsr     PATCH4
         nop
@@ -3014,7 +3014,7 @@ FRM_VARIABLE_CALL	= *-1
         ldx     VALTYP
         beq     L2DB1
 .ifdef CBM
-.ifdef CBM1
+.ifdef CONFIG_CBM1_PATCHES
         jmp     PATCH2
         clc
 LCE3B:
@@ -3058,7 +3058,7 @@ L2DB1:
         jmp     GIVAYF
 L2DC2:
 .endif
-.ifdef CBM1
+.ifdef CONFIG_CBM1_PATCHES
         jmp     PATCH3
 .endif
 .ifdef CBM2
@@ -7070,7 +7070,7 @@ RAMSTART2:
         .byte   $08,$29,$25,$20,$60,$2A,$E5,$E4
         .byte   $20,$66,$24,$65,$AC,$04,$A4
 .endif /* KIM */
-.ifdef CBM1
+.ifdef CONFIG_CBM1_PATCHES
 PATCH1:
         clc
         jmp     CONTROL_C_TYPED