Mercurial Repositories > eric / file diff

--- a/eric6.py	Wed Dec 14 19:27:10 2016 +0100
+++ b/eric6.py	Wed Dec 14 19:31:53 2016 +0100
@@ -16,8 +16,8 @@
 import sys
 
 # generate list of arguments to be remembered for a restart
-restartArgsList = ["--nosplash", "--no-splash", "--plugin", "--debug",
-                   "--config", "--pyqt4", "--settings", "--disable-crash"]
+restartArgsList = ["--no-splash", "--plugin", "--debug", "--config",
+                   "--pyqt4", "--settings", "--disable-crash"]
 restartArgs = [arg for arg in sys.argv[1:]
                if arg.split("=", 1)[0] in restartArgsList]
 
@@ -113,15 +113,9 @@
     client = E5SingleApplicationClient()
     res = client.connect()
     if res > 0:
-        # deprecated option
-        if "--nosplash" in sys.argv and sys.argv.index("--nosplash") < ddindex:
-            del sys.argv[sys.argv.index("--nosplash")]
         if "--no-splash" in sys.argv and \
                 sys.argv.index("--no-splash") < ddindex:
             del sys.argv[sys.argv.index("--no-splash")]
-        # deprecated option
-        if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex:
-            del sys.argv[sys.argv.index("--noopen")]
         if "--no-open" in sys.argv and sys.argv.index("--no-open") < ddindex:
             del sys.argv[sys.argv.index("--no-open")]
         if "--no-crash" in sys.argv and sys.argv.index("--no-crash") < ddindex:
@@ -293,11 +287,7 @@
 
     # generate and show a splash window, if not suppressed
     from UI.SplashScreen import SplashScreen, NoneSplashScreen
-    if "--nosplash" in sys.argv and sys.argv.index("--nosplash") < ddindex:
-        # support for deprecated option
-        del sys.argv[sys.argv.index("--nosplash")]
-        splash = NoneSplashScreen()
-    elif "--no-splash" in sys.argv and sys.argv.index("--no-splash") < ddindex:
+    if "--no-splash" in sys.argv and sys.argv.index("--no-splash") < ddindex:
         del sys.argv[sys.argv.index("--no-splash")]
         splash = NoneSplashScreen()
     elif not Preferences.getUI("ShowSplash"):
@@ -321,11 +311,7 @@
     noopen = False
     nocrash = False
     disablecrash=False
-    if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex:
-        # support for deprecated option
-        del sys.argv[sys.argv.index("--noopen")]
-        noopen = True
-    elif "--no-open" in sys.argv and sys.argv.index("--no-open") < ddindex:
+    if "--no-open" in sys.argv and sys.argv.index("--no-open") < ddindex:
         del sys.argv[sys.argv.index("--no-open")]
         noopen = True
     if "--no-crash" in sys.argv and sys.argv.index("--no-crash") < ddindex: