Kernel 0.93++

BIN/EDIT.S.BUF.txt

@@ -23,13 +23,12 @@ BUF.InsertA		sta TmpByte
 .9				rts
 *--------------------------------------
 BUF.InsertTAB	>LDA.G FileX
-				and #TABMASK
-				bne .1
-				
-				lda #TABLEN
-
-.1				sta TmpByte
+				and #3					0-3
+				eor #$3					3-0
 				
+				inc
+				sta TmpByte
+	
 				jsr BUF.ComputeCOffset
 				tya
 				sec
@@ -52,11 +51,10 @@ BUF.InsertTAB	>LDA.G FileX
 				dey
 				bpl .2
 
-.4				jsr SCRN.UpdateStatusBar
-				
 				jmp SCRN.Unsaved
 
-.8				clc	
+.8				stz TmpByte
+				clc	
 .9				rts				
 *--------------------------------------
 BUF.DelCharAtCursor

BIN/EDIT.S.CTRL.txt

@@ -161,10 +161,12 @@ Ctrl.BS			>LDA.G FileX
 *--------------------------------------
 Ctrl.TAB		jsr BUF.InsertTAB
 				bcs .9
+
+				lda TmpByte
+				beq .9					nothing to do
 				
-				>LDA.G FileX
-				clc
-				adc TmpByte
+*				clc
+				>ADC.G FileX
 				sta (pData),y
 				
 				>LDA.G CurX
@@ -176,19 +178,22 @@ Ctrl.TAB		jsr BUF.InsertTAB
 				>SBC.G ScreenX
 				sec
 				>SBC.G ScreenW
-				bcs .8
+				bcs .1
 
 				jsr SCRN.UpdateCurrentLine
 				bcs .9
 				
-.8				clc
+				bra .8
+				
+.1				lda TmpByte
+				clc
 				>ADC.G ScreenX
-				inc
 				sta (pData),y
 
-				jsr SCRN.UpdateStatusBar
+				jsr SCRN.UpdateViewPort
 				
-				jmp SCRN.UpdateViewPort
+.8				jsr SCRN.GotoCurXCurY			
+				jmp SCRN.UpdateStatusBar
 				
 .9				rts
 *--------------------------------------
@@ -265,25 +270,25 @@ Ctrl.CR			lda #C.CR
 				
 .1				dec
 				>CMP.G ViewPortHm1
-				bne .6					No scroll needed
+				beq .6					No scroll needed
 				
-				>PUSHW L.SEQ.SCROLLCURDN
+				>LDA.G ScreenH
+				dec
+				>PUSHA
 				>LDA.G CurY
 				inc
 				inc
 				>PUSHA
-				>LDA.G ScreenH
-				dec
-				>PUSHA
 				>PUSHBI 2
+				>PUSHW L.SEQ.SCROLLCURDN
 				jsr SCRN.LineBufSprintf
 .99				bcs .9
 
-				>PUSHW L.SEQ.SCROLLRGN
 				>LDA.G ScreenH
 				dec
 				>PUSHA
 				>PUSHBI 1
+				>PUSHW L.SEQ.SCROLLRGN
 				jsr SCRN.LineBufSprintf
 				bcs .9
 

BIN/EDIT.S.txt

@@ -9,9 +9,6 @@ NEW
 				.INB INC/A2OSX.I
 				.INB INC/MLI.I
 				.INB INC/MLI.E.I
-*--------------------------------------
-TABLEN			.EQ 4
-TABMASK			.EQ 3
 *--------------------------------------
 				.DUMMY
 				.OR ZPBIN

SYS/KERNEL.S.ENV.txt

@@ -55,14 +55,16 @@ K.Expand		jsr K.strdup
 .23				cmp #'$'				no, found one ?
 				bne .22					no, store...
 
-				ror ENV.bExp			Toggle Expanded flag
 				lda (TXTPTR)
-				bne .30
+				bne .24
 
 				lda #'$'				End of string, output $
 				bra .22
 				
-.30				stz ENV.VarEndChar
+.24				
+*				sec
+				ror ENV.bExp			Toggle Expanded flag
+				stz ENV.VarEndChar
 				cmp #'{'				 "${VAR]"?
 				bne .31