Merged revisions 1981 via svnmerge from

http://[email protected]/svn/fpc/trunk

........
r1981 | hajny | 2005-12-18 21:55:31 +0000 (Sun, 18 Dec 2005) | 1 line

  * mistyping fixed (HMTL)
........

git-svn-id: branches/fixes_2_0@1985 -

fv/test/testapp.pas

@@ -45,9 +45,9 @@ PROGRAM TestApp;
      {$ifdef TEST}
      AsciiTab,
      {$endif TEST}
-     {$ifdef DEBUG}
+     { $ifdef DEBUG
      Gfvgraph,
-     {$endif DEBUG}
+     $endif DEBUG}
      Gadgets, TimedDlg, MsgBox;
 
 
@@ -122,7 +122,7 @@ Var
 {$endif DEBUG}
 begin
   inherited Idle;
-{$ifdef DEBUG}
+{ $ifdef DEBUG
    if WriteDebugInfo then
      begin
       WasSet:=true;
@@ -131,13 +131,13 @@ begin
    else
       WasSet:=false;
    if WriteDebugInfo then
-{$endif DEBUG}
+$endif DEBUG}
   Clock^.Update;
   Heap^.Update;
-{$ifdef DEBUG}
+{ $ifdef DEBUG
    if WasSet then
      WriteDebugInfo:=true;
-{$endif DEBUG}
+$endif DEBUG}
   if Desktop^.FirstThat(@IsTileable) <> nil then
     EnableCommands([cmTile, cmCascade])
   else

fv/test/tfileio.pas

@@ -1,27 +1,2 @@
-USES
-  FVCommon,FileIO;
-
-VAR
-  Handle : THandle;
-  buf    : ARRAY[0..255] OF CHAR;
-  n      : LongWord;
-BEGIN
-  Handle := FileOpen(AsciiZ('test'), fa_Create);
-  writeln('FileOpen: ',Handle);
-
-  buf := 'Test'#0;
-  writeln('FileWrite: ', FileWrite(handle, Buf, 5, n));
-  writeln('Bytes written: ', n);
-
-  Writeln('SetFileSize: ', SetFileSize(handle, 4));
-
-  Writeln('SetFilePos: ', SetFilePos(handle, 2, 0, (LongInt(n))));
-  Writeln('Actual: ', n);
-
-  Writeln('FileRead: ', FileRead(Handle, buf, 2, n) );
-  Writeln('Actual: ', n);
-
-  Writeln('Buf[0]=', Buf[0], ' Buf[1]=', Buf[1]);
-
-  Writeln('FileClose: ', FileClose(Handle));
-END.
+begin
+end.

installer/install.dat

@@ -293,7 +293,7 @@ pack=Commo~n~
 # Common 1
 package=docs-pdf.zip,Documentation (~P~DF)
 # Common 2
-package=doc-html.zip[doc-htm.zip],Documentation (~H~MTL)
+package=doc-html.zip[doc-htm.zip],Documentation (~H~TML)
 # Common 3
 package=demo.zip,D~e~mos