diff --git a/rtl/unix/keyboard.pp b/rtl/unix/keyboard.pp
index bb4db9c89d..ef825418e4 100644
--- a/rtl/unix/keyboard.pp
+++ b/rtl/unix/keyboard.pp
@@ -1098,12 +1098,12 @@ Begin
               if ch<>#0 then
                 begin
                   { 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(InHead);
-                  {Wrap if End has Reached}
-                  if InHead>=InSize then
-                   InHead:=0;
                 end;
               break;
             end;
@@ -1724,7 +1724,10 @@ begin
 end.
 {
   $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
 
   Revision 1.4  2001/06/27 21:37:38  peter
diff --git a/rtl/unix/video.pp b/rtl/unix/video.pp
index 6f6d26acc9..5755039f0a 100644
--- a/rtl/unix/video.pp
+++ b/rtl/unix/video.pp
@@ -460,7 +460,9 @@ begin
      if (Spaces>0) then
       OutSpaces;
      if force then
-      inc(eol);
+      inc(eol)
+     else
+      skipped:=true;
    end;
   eol:=0;
   OutData(XY2Ansi(CursorX,CursorY,LastX,LastY));
@@ -845,7 +847,10 @@ finalization
 end.
 {
   $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)
 
   Revision 1.5  2001/07/31 19:33:46  peter