X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=65bd38cb65ab16655c503d6ab51701075069a380;hb=dad1fc66e44a4dad94eb1e9ffd5736bf8f59ae6d;hp=b20b2aee64ed81370cb84eec46ded5d46ed57611;hpb=53274e31ec1cc715c0b48921ee67818790c2e99a;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index b20b2aee64..65bd38cb65 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -9,10 +9,6 @@
 #include <config.h>
 #include <version.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyx_main.h"
 
 #include "support/filetools.h"
@@ -294,8 +290,8 @@ void LyX::init(bool gui)
 		FileInfo file(fullbinpath, true);
 		followlink = file.isLink();
 		if (followlink) {
-			lyxerr << " directory " << fullbinpath
-			       << " is a link" << endl;
+			lyxerr[Debug::INIT] << " directory " << fullbinpath
+					    << " is a link" << endl;
 			string link;
 			if (LyXReadLink(fullbinpath, link, true)) {
 				fullbinpath = link;
@@ -447,7 +443,7 @@ void LyX::init(bool gui)
 	// If there is a preferences file we read that instead
 	// of the old lyxrc file.
 	if (!readRcFile("preferences"))
-	    readRcFile("lyxrc");
+		readRcFile("lyxrc");
 
 	readEncodingsFile("encodings");
 	readLanguagesFile("languages");
@@ -463,11 +459,6 @@ void LyX::init(bool gui)
 	// Read menus
 	readUIFile(lyxrc.ui_file);
 
-	// Bind the X dead keys to the corresponding LyX functions if
-	// necessary.
-	if (lyxrc.override_x_deadkeys)
-		deadKeyBindings(toplevel_keymap.get());
-
 	if (lyxerr.debugging(Debug::LYXRC)) {
 		lyxrc.print();
 	}