Mercurial Repositories > eric / file diff

--- a/PluginManager/PluginManager.py	Mon Dec 04 16:25:40 2017 +0100
+++ b/PluginManager/PluginManager.py	Wed Dec 06 18:53:48 2017 +0100
@@ -304,22 +304,23 @@
             if self.isValidPluginName(develPluginName):
                 develPluginName = develPluginName[:-3]
         
-        for pluginName in self.__foundCoreModules:
-            # global and user plugins have priority
-            if pluginName not in self.__foundGlobalModules and \
-               pluginName not in self.__foundUserModules and \
-               pluginName != develPluginName:
-                self.loadPlugin(pluginName, self.pluginDirs["eric6"])
-        
         for pluginName in self.__foundGlobalModules:
-            # user plugins have priority
+            # user and core plug-ins have priority
             if pluginName not in self.__foundUserModules and \
+               pluginName not in self.__foundCoreModules and \
                pluginName != develPluginName:
                 self.loadPlugin(pluginName, self.pluginDirs["global"])
         
         for pluginName in self.__foundUserModules:
+            # core plug-ins have priority
+            if pluginName not in self.__foundCoreModules and \
+               pluginName != develPluginName:
+                self.loadPlugin(pluginName, self.pluginDirs["user"])
+        
+        for pluginName in self.__foundCoreModules:
+            # plug-in under development has priority
             if pluginName != develPluginName:
-                self.loadPlugin(pluginName, self.pluginDirs["user"])
+                self.loadPlugin(pluginName, self.pluginDirs["eric6"])
         
         if develPluginName:
             self.loadPlugin(develPluginName, develPluginPath)