Move command line arg --batch to -batch.

Things are still bit inconsistent due to the existence of
additional -- switches, but the correct fix is not so easy.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34005 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2bea4241a480dde338c128bd23291c78a08ced2d..ab23e5077bedf67401a14ba595dec295109d4d4f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -11,7 +11,7 @@ Interface changes
 There have been some changes to the LyX command line. There is a new option 
 "--batch" that causes LyX to run the given commands without opening a GUI 
 window. Thus, something like:
-    lyx --batch -x "buffer-print printer default dvips" myfile.lyx
+    lyx -batch -x "buffer-print printer default dvips" myfile.lyx
 will cause LyX to print myfile.lyx to the default printer, using dvips and 
 the default print settings (which, of course, have to have been configured 
 already). At present, not many commands can be used this way, but there will

diff --git a/lib/scripts/bash_completion b/lib/scripts/bash_completion
index 35981ac3f6cae4e8f891b5fc465e549fbe01274d..8236beb1a6cbb2c0b7579924d835a7805bb2fb93 100644 (file)
--- a/lib/scripts/bash_completion
+++ b/lib/scripts/bash_completion
@@ -13,7 +13,7 @@ _lyx()
         if [[ "$cur" == -* ]]; then
                 COMPREPLY=( $( compgen -W '-help -userdir -sysdir \
                                -geometry -dbg -x --execute -e --export \
-                               -i --import -version' -- $cur ) ) 
+                               -i --import -version -batch' -- $cur ) ) 
         else
                 _filedir '@(lyx)'
         fi

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 9c419dff4290532be9a17f25082c57faadf5114e..7f78e3e0308f542430b0da31393ce1da24ed5959 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -987,7 +987,7 @@ int parse_help(string const &, string const &, string &)
                  "\t-i [--import] fmt file.xxx\n"
                  "                  where fmt is the import format of choice\n"
                  "                  and file.xxx is the file to be imported.\n"
-                 "\t--batch         execute commands and exit\n"
+                 "\t-batch          execute commands without launching GUI and exit.\n"
                  "\t-version        summarize version and build info\n"
                               "Check the LyX man page for more details.")) << endl;
        exit(0);
@@ -1110,7 +1110,7 @@ void LyX::easyParse(int & argc, char * argv[])
        cmdmap["-i"] = parse_import;
        cmdmap["--import"] = parse_import;
        cmdmap["-geometry"] = parse_geometry;
-       cmdmap["--batch"] = parse_batch;
+       cmdmap["-batch"] = parse_batch;
 
        for (int i = 1; i < argc; ++i) {
                map<string, cmd_helper>::const_iterator it