--- a/ResourcePack.st	Wed Oct 27 18:05:36 1999 +0200
+++ b/ResourcePack.st	Thu Oct 28 01:00:08 1999 +0200
@@ -558,7 +558,9 @@
             value := self at:macroName ifAbsent:nil.
             (value isNil) ifTrue:[
                 hasError := true.
-                ('ResourcePack [warning]: bad =-macro in line: ' , lineString) errorPrintCR.
+                ('ResourcePack [warning]: bad (nil-valued) macro: ' , macroName) errorPrintCR.
+		('ResourcePack [warning]: in line: ' , lineString) errorPrintCR.
+		('ResourcePack [warning]: in file: ' , fileName) errorPrintCR.
             ].
             value isBlock ifTrue:[
                 value := value value
@@ -570,12 +572,14 @@
             (value == #Error) ifTrue:[
                 hasError := true.
                 ('ResourcePack [warning]: error in line: "self ' , rest , '"') errorPrintCR.
+		('ResourcePack [warning]: in file: ' , fileName) errorPrintCR.
             ]
         ] ifFalse:[
             value := Compiler evaluate:rest compile:false.
             (value == #Error) ifTrue:[
                 hasError := true.
                 ('ResourcePack [warning]: error in line: "' , rest , '"') errorPrintCR.
+		('ResourcePack [warning]: in file: ' , fileName) errorPrintCR.
             ] ifFalse:[
                 encoding notNil ifTrue:[
                     value isString ifTrue:[
@@ -738,6 +742,6 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.54 1999-10-27 13:30:08 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.55 1999-10-27 23:00:08 stefan Exp $'
 ! !
 ResourcePack initialize!