From b1be8ffd32af91b7365a4bcc8cdd6b3a8d62ad4d Mon Sep 17 00:00:00 2001
From: daniel <daniel@freepascal.org>
Date: Sat, 6 May 2006 11:02:46 +0000
Subject: [PATCH]   * Removal of memory unit by Wayne Sherman

git-svn-id: trunk@3430 -
---
 fv/editors.pas | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/fv/editors.pas b/fv/editors.pas
index 48d666a6c1..fac1d4f456 100644
--- a/fv/editors.pas
+++ b/fv/editors.pas
@@ -403,7 +403,7 @@ procedure RegisterEditors;
 implementation
 
 uses
-  Memory, Dos, App, StdDlg, MsgBox, Resource;
+  Dos, App, StdDlg, MsgBox, Resource;
 
 type
   pword = ^word;
@@ -1217,6 +1217,7 @@ end;
 destructor TLineInfo.Done;
 begin
   FreeMem(Info,MaxPos*sizeof(TLineInfoRec));
+  Info := nil;
 end;
 
 
@@ -1593,11 +1594,7 @@ end; { TEditor.DeleteSelect }
 
 procedure TEditor.DoneBuffer;
 begin
-  if assigned(Buffer) then
-  begin
-    FreeMem (Buffer, BufSize);
-    Buffer := nil;
-  end;
+  ReAllocMem(Buffer, 0);
 end; { TEditor.DoneBuffer }
 
 
@@ -2151,7 +2148,8 @@ end; { TEditor.HideSelect }
 
 procedure TEditor.InitBuffer;
 begin
-  Buffer := MemAlloc (BufSize);
+  Assert(Buffer = nil, 'TEditor.InitBuffer: Buffer is not nil');
+  ReAllocMem(Buffer, BufSize);
 end; { TEditor.InitBuffer }
 
 
@@ -2946,8 +2944,9 @@ end; { TEditor.SetBufLen }
 
 function TEditor.SetBufSize (NewSize : Sw_Word) : Boolean;
 begin
-//  SetBufSize := NewSize <= BufSize;
-  SetBufSize := SetBufferSize(Buffer, NewSize);
+  ReAllocMem(Buffer, NewSize);
+  BufSize := NewSize;
+  SetBufSize := True;
 end; { TEditor.SetBufSize }
 
 
@@ -3436,8 +3435,7 @@ end; { TFileEditor.Load }
 
 procedure TFileEditor.DoneBuffer;
 begin
-  if assigned(Buffer) then
-    DisposeBuffer (Buffer);
+  ReAllocMem(Buffer, 0);
 end; { TFileEditor.DoneBuffer }
 
 
@@ -3463,7 +3461,9 @@ end; { TFileEditor.HandleEvent }
 
 procedure TFileEditor.InitBuffer;
 begin
-  NewBuffer(Pointer(Buffer), MinBufLength);
+  Assert(Buffer = nil, 'TFileEditor.InitBuffer: Buffer is not nil');
+  ReAllocMem(Buffer, MinBufLength);
+  BufSize := MinBufLength;
 end; { TFileEditor.InitBuffer }
 
 
@@ -3579,13 +3579,10 @@ begin
       NewSize := (NewSize + (MinBufLength-1)) and (MaxBufLength and (not (MinBufLength-1)));
   if NewSize <> BufSize then
    begin
-     if NewSize > BufSize then
-      if not SetBufferSize(pointer(Buffer), NewSize) then
-       Exit;
+     if NewSize > BufSize then ReAllocMem(Buffer, NewSize);
      N := BufLen - CurPtr + DelCount;
      Move(Buffer^[BufSize - N], Buffer^[NewSize - N], N);
-     if NewSize < BufSize then
-       SetBufferSize(pointer(Buffer), NewSize);
+     if NewSize < BufSize then ReAllocMem(Buffer, NewSize);
      BufSize := NewSize;
      GapLen := BufSize - BufLen;
    end;