--- a/Method.st	Wed Jun 03 06:50:11 2015 +0200
+++ b/Method.st	Sat Jun 06 06:39:31 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -1333,7 +1335,7 @@
     doFlush ifTrue:[
         (aSymbol == #public and:[old ~~ #ignored]) ifFalse:[
             (sel := self selector) notNil ifTrue:[
-                ObjectMemory flushCachesForSelector:sel numArgs:self numArgs
+                ObjectMemory flushCachesForSelector:sel numArgs:self argumentCount
             ] ifFalse:[
                 ObjectMemory flushCaches.
             ].
@@ -2186,7 +2188,7 @@
         mgr := mclass sourceCodeManagerFromBinaryRevision
     ] ifFalse:[
         "I'm an extension and we don't have binary revision info (!!)
-         for extensions, try tp guess here"
+         for extensions, try to guess here"
         pkgDef := ProjectDefinition definitionClassForPackage: package.
         pkgDef notNil ifTrue:[
             mgr := pkgDef sourceCodeManagerFromBinaryRevision
@@ -2213,7 +2215,7 @@
     who notNil ifTrue:[
         myClass := who methodClass.
 
-        (package notNil and:[package ~= myClass package]) ifTrue:[
+        (package notNil and:[package ~= myClass package and:[package ~= #'__NoProject__']]) ifTrue:[
             "/ I am an extension
             mgr notNil ifTrue:[
                 "/ try to get the source using my package information ...
@@ -2663,7 +2665,7 @@
 
     myCode := self code.
 
-    m := self trapMethodForNumArgs:(self numArgs).
+    m := self trapMethodForNumArgs:(self argumentCount).
     (m notNil and:[self ~~ m]) ifTrue:[
         (myCode notNil and:[myCode = m code]) ifTrue:[^ true].
         (byteCode notNil and:[byteCode == m byteCode]) ifTrue:[^ true].
@@ -3064,7 +3066,7 @@
 
     sourceString := self source.
     (parserClass notNil and:[sourceString notNil]) ifTrue:[
-        parseSelector numArgs == 2 ifTrue:[
+        parseSelector argumentCount == 2 ifTrue:[
             parser := parserClass perform:parseSelector with:sourceString with:arg2.
         ] ifFalse:[
             parser := parserClass perform:parseSelector with:sourceString.
@@ -3682,7 +3684,7 @@
 
     |invldMethod|
 
-    invldMethod := self trapMethodForNumArgs:(self numArgs).
+    invldMethod := self trapMethodForNumArgs:(self argumentCount).
     self code:invldMethod code.
     self byteCode:nil.
 
@@ -3909,11 +3911,11 @@
 !Method class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.462 2015-05-28 16:32:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.464 2015-06-05 16:10:36 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.462 2015-05-28 16:32:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.464 2015-06-05 16:10:36 stefan Exp $'
 !
 
 version_SVN