--- a\np2src\src\Notepad2.c	Fri Oct 31 11:59:18 2008
+++ b\np2src\src\Notepad2.c	Fri Oct 31 11:59:43 2008
@@ -4789,8 +4789,12 @@ void ParseCommandLine()
           iInitialLexer = 2;
           flagLexerSpecified = 1;
           break;
 
+        case L'Z':
+          ExtractFirstArgument(lp2,lp1,lp2);
+          break;
+
         case L'?':
           flagDisplayHelp = 1;
           break;
 
--- a\np2src\src\Notepad2.rc	Fri Oct 31 11:59:18 2008
+++ b\np2src\src\Notepad2.rc	Fri Oct 31 11:59:43 2008
@@ -1270,9 +1270,9 @@ BEGIN
 END
 
 STRINGTABLE 
 BEGIN
-    IDS_CMDLINEHELP         "Notepad2.exe Command Line Switches\n\n/g\tJump to specified position (-1 means end of file).\n/m\tMatch specified text.\n/q\tForce creation of new files without prompt.\n/s\tSelect specified syntax scheme.\n/t\tSelect default text scheme.\n/h\tSelect Web Source Code scheme.\n/x\tSelect XML Document scheme.\n/c\tOpen new window and paste clipboard contents.\n/b\tOpen new paste board to collect clipboard entries.\n/n\tAlways open a new window.\n/p\tSet window position and size (/p0 use system default).\n/i\tStart as tray icon.\n/f\tSpecify ini-file (/f0 use no ini-file)."
+    IDS_CMDLINEHELP         "Notepad2.exe Command Line Switches\n\n/g\tJump to specified position (-1 means end of file).\n/m\tMatch specified text.\n/q\tForce creation of new files without prompt.\n/s\tSelect specified syntax scheme.\n/t\tSelect default text scheme.\n/h\tSelect Web Source Code scheme.\n/x\tSelect XML Document scheme.\n/c\tOpen new window and paste clipboard contents.\n/b\tOpen new paste board to collect clipboard entries.\n/n\tAlways open a new window.\n/p\tSet window position and size (/p0 use system default).\n/i\tStart as tray icon.\n/f\tSpecify ini-file (/f0 use no ini-file).\n/z\tDiscard the next argument in the command line."
 END
 
 STRINGTABLE 
 BEGIN