From 3be9624a26be0cd4fb4a545a4ce6b548d96e7778 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Thu, 29 Aug 2002 10:04:25 +0000
Subject: [PATCH] + Fix for bug report 2097 in formatbuf

---
 rtl/objpas/sysstr.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rtl/objpas/sysstr.inc b/rtl/objpas/sysstr.inc
index 039d4211ed..d9ecfdff47 100644
--- a/rtl/objpas/sysstr.inc
+++ b/rtl/objpas/sysstr.inc
@@ -947,7 +947,11 @@ begin
   if fmtlen > 0 then
     Move(fmt,F[1],fmtlen);
   S:=Format (F,Args);
+<<<<<<< sysstr.inc
   If Cardinal(Length(S))>Buflen then
+=======
+  If cardinal(Length(S))>Buflen then
+>>>>>>> 1.1.2.9
     Result:=Length(S)
   else
     Result:=Buflen;
@@ -1338,7 +1342,10 @@ const
 
 {
   $Log$
-  Revision 1.15  2002-07-06 12:14:03  daniel
+  Revision 1.16  2002-08-29 10:04:25  michael
+  + Fix for bug report 2097 in formatbuf
+
+  Revision 1.15  2002/07/06 12:14:03  daniel
   - Changes from Strasbourg
 
   Revision 1.14  2002/01/24 12:33:53  jonas