More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 6597696bc84e6e49a424119f10cc5e5605a986b6..caf25a6908a24e8a7ef8d745d5f6a1e9cced187a 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -424,8 +424,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
        // Ensure that we have really read a bind file, so that LyX is
        // usable.
-       if (!lyxrc.hasBindFile)
-               lyxrc.ReadBindFile();
+       lyxrc.readBindFileIfNeeded();
 
        // Read menus
        ReadUIFile(lyxrc.ui_file);
@@ -714,7 +713,14 @@ void commandLineHelp()
                   "\t-dbg feature[,feature]...\n"
                   "                  select the features to debug.\n"
                   "                  Type `lyx -dbg' to see the list of features\n"
-                 "Check the LyX man page for more options.") << endl;
+                 "\t-x [--execute] command\n"
+                 "                  where command is a lyx command.\n"
+                 "\t-e [--export] fmt\n"
+                 "                  where fmt is the export format of choice.\n"
+                 "\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"
+                 "Check the LyX man page for more details.") << endl;
 }
 
 
@@ -794,7 +800,7 @@ bool LyX::easyParse(int * argc, char * argv[])
                                            "ps...] after ")
                                       << arg << _(" switch!") << endl;
                }
-               else if (arg == "--import") {
+               else if (arg == "-i" || arg == "--import") {
                        if (i + 1 < *argc) {
                                string type(argv[i+1]);
                                string file(argv[i+2]);