bug 2298: cursorTop/Bottom/Home/End does not redraw after dEPM

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 8ecd3edabcd2bc96957d47e7f10d99854d7faff2..f19801213e45725b82930232e67a873ca271d13b 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -117,9 +117,9 @@ void showFileError(string const & error)
 void reconfigureUserLyXDir()
 {
        string const configure_script =
-               AddName(package().system_support(), "configure");
+               AddName(package().system_support(), "configure.py");
        string const configure_command =
-               "sh " + QuoteName(configure_script);
+               "python " + QuoteName(configure_script);
 
        lyxerr << _("LyX: reconfiguring user directory") << endl;
        Path p(package().user_support());
@@ -230,8 +230,6 @@ void LyX::priv_exec(int & argc, char * argv[])
        if (want_gui)
                lyx_gui::parse_lyxrc();
 
-       initMath();
-
        vector<string> files;
 
        for (int argi = argc - 1; argi >= 1; --argi)
@@ -482,7 +480,7 @@ void LyX::init(bool gui)
 
 #if !defined (USE_POSIX_PACKAGING)
        // Add the directory containing the LyX executable to the path
-       // so that LyX can find things like reLyX.
+       // so that LyX can find things like tex2lyx.
        if (package().build_support().empty())
                prependEnvPath("PATH", package().binary_dir());
 #endif
@@ -623,7 +621,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
            fs::is_directory(package().user_support())) {
                first_start = false;
                string const configure_script =
-                       AddName(package().system_support(), "configure");
+                       AddName(package().system_support(), "configure.py");
                string const userDefaults =
                        AddName(package().user_support(), "lyxrc.defaults");
                if (fs::exists(configure_script) &&
@@ -641,7 +639,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
        // to create it. If the user says "no", then exit.
        if (explicit_userdir &&
            Alert::prompt(
-                   _("Missing LyX support directory"),
+                   _("Missing user LyX directory"),
                    bformat(_("You have specified a non-existent user "
                              "LyX directory, %1$s.\n"
                              "It is needed to keep your own configuration."),