Text2.cpp (checkAndActivateInset, checkAndActivateInsetVisual): activate insets on...

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 41c69f7dae4d77f031290dfed4b0dede36b8de3d..023f80dfc121c446ac93b01f1d7cbd853de41939 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -33,6 +33,7 @@
 #include "FuncStatus.h"
 #include "HunspellChecker.h"
 #include "KeyMap.h"
+#include "Language.h"
 #include "LaTeXFonts.h"
 #include "LayoutFile.h"
 #include "Lexer.h"
@@ -356,7 +357,7 @@ int LyX::exec(int & argc, char * argv[])
 
        // FIXME
        /* Create a CoreApplication class that will provide the main event loop
-       * and the socket callback registering. With Qt4, only QtCore
+       * and the socket callback registering. With Qt, only QtCore
        * library would be needed.
        * When this is done, a server_mode could be created and the following two
        * line would be moved out from here.
@@ -666,7 +667,7 @@ static void error_handler(int err_sig)
        if (!msg.empty()) {
                lyxerr << "\nlyx: " << msg << endl;
                // try to make a GUI message
-               Alert::error(_("LyX crashed!"), msg);
+               Alert::error(_("LyX crashed!"), msg, true);
        }
 
        // Deinstall the signal handlers
@@ -1088,9 +1089,11 @@ int parse_version(string const &, string const &, string &)
 {
        cout << "LyX " << lyx_version
               << " (" << lyx_release_date << ")" << endl;
+       if (string(lyx_git_commit_hash) != "none")
+               cout << to_utf8(_("  Git commit hash "))
+                    << string(lyx_git_commit_hash).substr(0,8) << endl;
        cout << to_utf8(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
                from_ascii(__DATE__), from_ascii(__TIME__))) << endl;
-
        cout << lyx_version_info << endl;
        exit(0);
        return 0;