X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=fc2f87110176850254fcc9e6791e051d39821cfd;hb=557d33b7e518f29f33ebec79439404bd1fe38f93;hp=9b637570d5f9adb4d5071b822ee92bd129b14ed7;hpb=3aae85edf1942c2272c4dad8a47fd32f8713e4f7;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 9b637570d5..fc2f871101 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -27,6 +27,7 @@
 #include "ConverterCache.h"
 #include "Converter.h"
 #include "CutAndPaste.h"
+#include "DispatchResult.h"
 #include "EnchantChecker.h"
 #include "Encoding.h"
 #include "ErrorList.h"
@@ -37,8 +38,6 @@
 #include "Language.h"
 #include "LaTeXFonts.h"
 #include "LayoutFile.h"
-#include "Lexer.h"
-#include "LyX.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "ModuleList.h"
@@ -46,7 +45,6 @@
 #include "Server.h"
 #include "ServerSocket.h"
 #include "Session.h"
-#include "WordList.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
@@ -65,7 +63,6 @@
 #include "support/Package.h"
 #include "support/unique_ptr.h"
 
-#include <algorithm>
 #include <csignal>
 #include <iostream>
 #include <functional>
@@ -234,7 +231,7 @@ public:
 		  argc_(argc), argv_(argv)
 	{
 	}
-	void doExec()
+	void doExec() override
 	{
 		int const exit_status = lyx_->execWithoutGui(argc_, argv_);
 		exit(exit_status);
@@ -1106,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);
 	}
@@ -1183,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;
 }