cleanup

defines_cbm1.s

@@ -25,16 +25,14 @@
 ; oldest known version, no CONFIG_n
 
 CONFIG_CBM_ALL := 1
+CONFIG_CBM1_PATCHES := 1 ; ** don't turn off! **
 
+CONFIG_DATAFLG := 1
 CONFIG_FILE := 1; support PRINT#, INPUT#, GET#, CMD
 CONFIG_NO_CR := 1; terminal doesn't need explicit CRs on line ends
 CONFIG_NO_LINE_EDITING := 1; support for "@", "_", BEL etc.
-CONFIG_SCRTCH_ORDER := 2
-
-CONFIG_CBM1_PATCHES := 1 ; ** don't turn off! **
-CONFIG_DATAFLG := 1
 CONFIG_PRINTNULLS := 1; whether PRINTNULLS does anything
-CONFIG_SPC_IS_CRSR_RIGHT := 1; always print CRSR RIGHT for SPC() (otherwise only for screen output)
+CONFIG_SCRTCH_ORDER := 2
 
 ; zero page
 ZP_START1 = $00
@@ -47,7 +45,6 @@ CURDVC			:= $0003
 Z96				:= $020C
 USR				:= GORESTART
 
-
 ; constants
 SPACE_FOR_GOSUB := $36
 STACK_TOP		:= $FC

defines_cbm2.s

@@ -1,17 +1,16 @@
 ; configuration
-CONFIG_CBM_ALL := 1
-
-CONFIG_FILE := 1; support PRINT#, INPUT#, GET#, CMD
-CONFIG_NO_CR := 1; terminal doesn't need explicit CRs on line ends
-CONFIG_NO_LINE_EDITING := 1; support for "@", "_", BEL etc.
-CONFIG_SCRTCH_ORDER := 2
-
 CONFIG_2A := 1
 
+CONFIG_CBM_ALL := 1
+
 CONFIG_DATAFLG := 1
 CONFIG_EASTER_EGG := 1
+CONFIG_FILE := 1; support PRINT#, INPUT#, GET#, CMD
+CONFIG_NO_CR := 1; terminal doesn't need explicit CRs on line ends
+CONFIG_NO_LINE_EDITING := 1; support for "@", "_", BEL etc.
 CONFIG_NO_READ_Y_IS_ZERO_HACK := 1
 CONFIG_PEEK_SAVE_LINNUM := 1
+CONFIG_SCRTCH_ORDER := 2
 
 ; zero page
 ZP_START1 = $00

token.s

@@ -109,14 +109,15 @@ UNFNC:
 		keyword_addr "SGN", SGN, TOKEN_SGN
 		keyword_addr "INT", INT
 		keyword_addr "ABS", ABS
-.ifdef CONFIG_NO_POKE
+.ifdef KBD
 		keyword_addr "VER", VER
-.else
-.ifdef CONFIG_RAM
-		keyword_addr "USR", IQERR
-.else
-		keyword_addr "USR", USR
 .endif
+.ifndef CONFIG_NO_POKE
+  .ifdef CONFIG_RAM
+		keyword_addr "USR", IQERR
+  .else
+		keyword_addr "USR", USR
+  .endif
 .endif
 		keyword_addr "FRE", FRE
 		keyword_addr "POS", POS