* v10 merges

This commit is contained in:
peter 2001-08-30 20:55:08 +00:00
parent 4e4c76d366
commit d1e24959d7
2 changed files with 16 additions and 8 deletions

View File

@ -1098,12 +1098,12 @@ Begin
if ch<>#0 then if ch<>#0 then
begin begin
{ Put that unused char back into InBuf } { Put that unused char back into InBuf }
InBuf[InHead]:=ch; If InTail=0 then
InTail:=InSize-1
else
Dec(InTail);
InBuf[InTail]:=ch;
inc(InCnt); inc(InCnt);
inc(InHead);
{Wrap if End has Reached}
if InHead>=InSize then
InHead:=0;
end; end;
break; break;
end; end;
@ -1724,7 +1724,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.6 2001-08-04 11:05:21 peter Revision 1.7 2001-08-30 20:55:08 peter
* v10 merges
Revision 1.6 2001/08/04 11:05:21 peter
* unpush key fix * unpush key fix
Revision 1.4 2001/06/27 21:37:38 peter Revision 1.4 2001/06/27 21:37:38 peter

View File

@ -460,7 +460,9 @@ begin
if (Spaces>0) then if (Spaces>0) then
OutSpaces; OutSpaces;
if force then if force then
inc(eol); inc(eol)
else
skipped:=true;
end; end;
eol:=0; eol:=0;
OutData(XY2Ansi(CursorX,CursorY,LastX,LastY)); OutData(XY2Ansi(CursorX,CursorY,LastX,LastY));
@ -845,7 +847,10 @@ finalization
end. end.
{ {
$Log$ $Log$
Revision 1.6 2001-08-01 21:42:05 peter Revision 1.7 2001-08-30 20:55:08 peter
* v10 merges
Revision 1.6 2001/08/01 21:42:05 peter
* m68k warning fix (merged) * m68k warning fix (merged)
Revision 1.5 2001/07/31 19:33:46 peter Revision 1.5 2001/07/31 19:33:46 peter