--- a/AbstractSourceCodeManager.st	Thu Nov 27 21:10:44 2014 +0100
+++ b/AbstractSourceCodeManager.st	Thu Nov 27 21:12:44 2014 +0100
@@ -1702,7 +1702,7 @@
 !
 
 isExtensionsVersionMethodSelector: selector 
-    "true if the given selector is for one of the manager's extensions version methods.
+    "true if the given selector is for ANY of the manager's extensions version methods.
      These are all named extensionVersion_XXX, where XXX is manager-specific (CVS, P4, SVN etc.).
      For backward compatibility (times, when there was only one CVS sourcecode manager,
      the selector named 'extensionsVersion' alone also counts as a version method
@@ -1893,20 +1893,21 @@
 !
 
 sourceCodeManagerForPackage:aPackageID
-    |module mgr|
+    |defaultManager module mgr|
 
     "JV@2012-01-23: If source code management is disabled, return #(). Following code
      is hack since there is no global boolean flag, sigh"
-    (Smalltalk at:#SourceCodeManager) isNil ifTrue:[ ^ nil ].
+    defaultManager := Smalltalk at:#SourceCodeManager.
+    defaultManager isNil ifTrue:[ "eg. disabled" ^ nil ].
 
     aPackageID notNil ifTrue:[
         "/ see if there is a package-specific manager
         (mgr := self managerForPackage:aPackageID) notNil ifTrue:[^ mgr].
 
-       "/ more or less obsolete now - I know which manager is to be used per package
-"/        self availableManagers do:[:mgr |
-"/            (mgr isResponsibleForPackage:aPackageID) ifTrue:[^ mgr ].
-"/        ].
+        "/ more or less obsolete now - I know which manager is to be used per package
+        "/        self availableManagers do:[:mgr |
+        "/            (mgr isResponsibleForPackage:aPackageID) ifTrue:[^ mgr ].
+        "/        ].
 
         "/ old stuff: see if there is a module-specific manager
         module := aPackageID upTo:$:.
@@ -1914,7 +1915,7 @@
             (mgr isResponsibleForModule:module) ifTrue:[^ mgr ].
         ]
     ].
-    ^ Smalltalk at:#SourceCodeManager
+    ^ defaultManager
 
     "
      self sourceCodeManagerForPackage:'stx:libbasic'.
@@ -3972,15 +3973,15 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.331 2014-10-04 11:29:36 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.332 2014-11-27 20:12:44 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.331 2014-10-04 11:29:36 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.332 2014-11-27 20:12:44 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: AbstractSourceCodeManager.st,v 1.331 2014-10-04 11:29:36 vrany Exp $'
+    ^ '$Id: AbstractSourceCodeManager.st,v 1.332 2014-11-27 20:12:44 cg Exp $'
 ! !