Load ucs before utf8x inputenc with recent ucs versions

[features.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index c1369bcde726e2fce39d35eb65427c47bd7813ab..fc2f87110176850254fcc9e6791e051d39821cfd 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -38,7 +38,6 @@
 #include "Language.h"
 #include "LaTeXFonts.h"
 #include "LayoutFile.h"
-#include "LyX.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "ModuleList.h"
@@ -1104,7 +1103,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
 
        if (!sup.createDirectory(0755)) {
                // Failed, so let's exit.
-               lyxerr << to_utf8(_("Failed to create directory. Exiting."))
+               lyxerr << to_utf8(_("Failed to create directory. Perhaps wrong -userdir option?\nExiting."))
                       << endl;
                earlyExit(EXIT_FAILURE);
        }
@@ -1181,10 +1180,15 @@ int parse_dbg(string const & arg, string const &, string &)
                Debug::showTags(cout);
                exit(0);
        }
-       lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl;
-
-       lyxerr.setLevel(Debug::value(arg));
-       Debug::showLevel(lyxerr, lyxerr.level());
+       string bad = Debug::badValue(arg);
+       if (bad.empty()) {
+               lyxerr.setLevel(Debug::value(arg));
+               Debug::showLevel(lyxerr, lyxerr.level());
+       } else {
+               cout << to_utf8(bformat(_("Bad debug value `%1$s'. Exiting."),
+                                       from_utf8(bad))) << endl;
+               exit(1);
+       }
        return 1;
 }