mathed31.diff

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 60f322ea01d5474294b104edc4076f18a06be1e9..b39866318f7e94ddd54957b89eec8894cb79966f 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -318,10 +318,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
        // Warn the user if we couldn't find "chkconfig.ltx"
        if (system_lyxdir == "./") {
-               lyxerr <<_("LyX Warning! Couldn't determine system directory.")
-                      <<_("Try the '-sysdir' command line parameter or")
+               lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
+                      <<_("Try the '-sysdir' command line parameter or ")
                       <<_("set the environment variable LYX_DIR_11x to the "
-                          "LyX system directory")
+                          "LyX system directory ")
                       << _("containing the file `chkconfig.ltx'.") << endl;
                if (!path_shown)
                        lyxerr << _("Using built-in default ") 
@@ -351,10 +351,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        bool explicit_userdir = true;
        if (user_lyxdir.empty()) {
 
-       // LYX_USERDIR_11x environment variable
+               // LYX_USERDIR_11x environment variable
                user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
 
-       // default behaviour
+               // default behaviour
                if (user_lyxdir.empty())
                        user_lyxdir = AddPath(GetEnvPath("HOME"),
                                                        string(".") + PACKAGE);
@@ -364,8 +364,12 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        lyxerr[Debug::INIT] << "User LyX directory: '" 
                            <<  user_lyxdir << '\'' << endl;
 
-       // Check that user LyX directory is ok.
-       queryUserLyXDir(explicit_userdir);
+       // Check that user LyX directory is ok. We don't do that if
+       // running in batch mode.
+       if (gui)
+               queryUserLyXDir(explicit_userdir);
+       else
+               first_start = false;
 
        //
        // Shine up lyxrc defaults
@@ -409,10 +413,6 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        if (!ReadRcFile("preferences"))
            ReadRcFile("lyxrc");
 
-       /// Init Converter
-       converters.Update(formats);
-       converters.BuildGraph();
-
        // Read encodings
        ReadEncodingsFile("encodings");
        // Read languages
@@ -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);