--- a/CVSSourceCodeManager.st	Sun May 12 13:22:47 2019 +0200
+++ b/CVSSourceCodeManager.st	Wed May 15 14:07:31 2019 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
               All Rights Reserved
@@ -4126,7 +4124,7 @@
     "
 !
 
-newestRevisionInFile:classFileName directory:packageDir module:moduleDir
+newestRevisionInFile:classFileName directory:packageDirOrNil module:moduleDir
     "return the newest revision found in a container.
      Return nil on failure."
 
@@ -4140,17 +4138,17 @@
         info := self
                 statusOf:nil 
                 fileName:classFileName 
-                directory:packageDir 
+                directory:packageDirOrNil 
                 module:moduleDir.
 
         info isNil ifTrue:[^ nil].
         ^ info at:#newestRevision ifAbsent:nil 
     ].
 
-    packageDir isEmptyOrNil ifTrue:[
+    packageDirOrNil isEmptyOrNil ifTrue:[
         modulePath := moduleDir
     ] ifFalse:[
-        modulePath :=  moduleDir , '/' , packageDir. 
+        modulePath :=  moduleDir , '/' , packageDirOrNil. 
     ].        
     fullName :=  modulePath , '/' , classFileName.
 
@@ -4220,6 +4218,7 @@
     "
 
     "Modified: / 06-03-2012 / 11:55:33 / cg"
+    "Modified (format): / 15-05-2019 / 14:06:46 / Claus Gittinger"
 !
 
 newestRevisionsInModule:module directory:packageDir
@@ -4646,17 +4645,17 @@
             "/ The repair code will be removed at some time in the future...
 
             "/ temporary fix Felix' bad string translation:
-            (aString startsWith:'§Header:') ifTrue:[
-                (aString endsWith:'Exp §') ifTrue:[
+            (aString startsWith:'§Header:') ifTrue:[
+                (aString endsWith:'Exp §') ifTrue:[
                     fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
 
                     aClass isNil ifTrue:[
                         autoFixHolder value ifFalse:[
-                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
+                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
                         ]
                     ] ifFalse:[
                         (autoFixHolder value 
-                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
+                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
                         ) ifTrue:[
                             self updateVersionMethodOf:aClass for:fixedString.
                         ].
@@ -4664,7 +4663,7 @@
                 ].
             ].
 
-            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
+            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
             (aString startsWith:'Header: ') ifTrue:[
                 (aString endsWith:'Exp ') ifTrue:[
                     fixedString := '$' , aString , '$'.
@@ -5548,7 +5547,7 @@
     "Created: / 23-07-2012 / 18:46:29 / cg"
 !
 
-statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
+statusOf:clsOrNil fileName:classFileName directory:packageDirOrNil module:moduleDir
     "return info about the status of a repository container.
      Return nil on failure.
 
@@ -5562,10 +5561,10 @@
     |tempDir fullName modulePath inStream line   
      info s msg|
 
-    packageDir isEmptyOrNil ifTrue:[
+    packageDirOrNil isEmptyOrNil ifTrue:[
         modulePath :=  moduleDir. 
     ] ifFalse:[        
-        modulePath :=  moduleDir , '/' , packageDir. 
+        modulePath :=  moduleDir , '/' , packageDirOrNil. 
     ].
     fullName :=  modulePath , '/' , classFileName.
     tempDir := self createTempDirectory:nil forModule:nil.
@@ -5674,6 +5673,7 @@
     "Modified: / 29-08-2006 / 13:18:00 / cg"
     "Modified (comment): / 18-05-2018 / 13:55:10 / Stefan Vogel"
     "Modified: / 04-10-2018 / 15:42:10 / Claus Gittinger"
+    "Modified (format): / 15-05-2019 / 14:07:08 / Claus Gittinger"
 ! !
 
 !CVSSourceCodeManager class methodsFor:'source code utilities'!
@@ -5995,7 +5995,7 @@
     "/ $-Revision: rev $
     "/ $-Id:       fileName rev date time user state $
     "/
-    (firstWord = '$Header:' or:[firstWord = '§Header:']) ifTrue:[
+    (firstWord = '$Header:' or:[firstWord = '§Header:']) ifTrue:[
         d := firstWord first.
         s skipSeparators.
         nm := s throughAll:',v '.
@@ -6025,12 +6025,12 @@
         ^ info
     ].
 
-    (firstWord = '$Revision:' or:[firstWord = '§Revision:']) ifTrue:[
+    (firstWord = '$Revision:' or:[firstWord = '§Revision:']) ifTrue:[
         info revision:(s upToEnd asCollectionOfWords first).
         ^ info
     ].
 
-    (firstWord = '$Id:' or:[firstWord = '§Id:']) ifTrue:[
+    (firstWord = '$Id:' or:[firstWord = '§Id:']) ifTrue:[
         "/commented out by Jan Vrany, 2009/10/20
         "/according to http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
         "/svn has no support for $ Header $ expansion. Therefore