mirror of
https://github.com/hsoft/collapseos.git
synced 2025-04-03 18:58:40 +11:00
132bc8f41c
Currently when BUF _type is executed, if there is a newline immediately after _type, no input is available. C< returns 0, and it is stored in the buffer. _type then proceeds to read until another newline is reached, and the resulting buffer contents looks like "\x00xyz\x0d" (in C string notation). This change makes _type exit early in this case and keep the buffer unchanged. _type is used by editor words such as I and F, so this bug affects them as well.
17 lines
496 B
Plaintext
17 lines
496 B
Plaintext
: _type ( buf -- )
|
|
C<? NOT IF DROP EXIT THEN
|
|
C< DUP 0xd = IF 2DROP EXIT THEN SWAP DUP _zbuf ( c a )
|
|
BEGIN ( c a ) C!+ C< TUCK 0x0d = UNTIL ( c a ) C! ;
|
|
( user-facing lines are 1-based )
|
|
: T 1- DUP 64 * EDPOS ! _pln ;
|
|
: P IBUF _type IBUF EDPOS @ _cpos 64 MOVE BLK!! ;
|
|
: _mvln+ ( ln -- move ln 1 line down )
|
|
DUP 14 > IF DROP EXIT THEN
|
|
_lpos DUP 64 + 64 MOVE ;
|
|
: _mvln- ( ln -- move ln 1 line up )
|
|
DUP 14 > IF DROP 15 _lpos _zbuf
|
|
ELSE 1+ _lpos DUP 64 - 64 MOVE THEN ;
|
|
|
|
|
|
|