X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=82dd64cbf9db6d70c1117adda9ca69a613d5f5c1;hb=916ae4222d5218ad7d5c2d5b989ed95437eb3491;hp=94c84c60de004e79459f0c86e11e938934f03f25;hpb=43772015fd538cb8c003204b7b69bc27a607bb1a;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 94c84c60de..82dd64cbf9 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -64,7 +64,7 @@ LyXServer * lyxserver = 0;
 bool finished = false;	// flag, that we are quitting the program
 
 // convenient to have it here.
-kb_keymap * toplevel_keymap;
+boost::scoped_ptr<kb_keymap> toplevel_keymap;
 
 
 LyX::LyX(int * argc, char * argv[])
@@ -78,8 +78,8 @@ LyX::LyX(int * argc, char * argv[])
 	bool gui = easyParse(argc, argv);
 
 	// Global bindings (this must be done as early as possible.) (Lgb)
-	toplevel_keymap = new kb_keymap;
-	defaultKeyBindings(toplevel_keymap);
+	toplevel_keymap.reset(new kb_keymap);
+	defaultKeyBindings(toplevel_keymap.get());
 	
 	// Make the GUI object, and let it take care of the
 	// command line arguments that concerns it.
@@ -318,10 +318,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
 	// Warn the user if we couldn't find "chkconfig.ltx"
 	if (system_lyxdir == "./") {
-		lyxerr <<_("LyX Warning! Couldn't determine system directory.")
-		       <<_("Try the '-sysdir' command line parameter or")
+		lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
+		       <<_("Try the '-sysdir' command line parameter or ")
 		       <<_("set the environment variable LYX_DIR_11x to the "
-			   "LyX system directory")
+			   "LyX system directory ")
 		       << _("containing the file `chkconfig.ltx'.") << endl;
 		if (!path_shown)
 			lyxerr << _("Using built-in default ") 
@@ -368,6 +368,8 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 	// running in batch mode.
 	if (gui)
 		queryUserLyXDir(explicit_userdir);
+	else
+		first_start = false;
 
 	//
 	// Shine up lyxrc defaults
@@ -411,10 +413,6 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 	if (!ReadRcFile("preferences"))
 	    ReadRcFile("lyxrc");
 
-	/// Init Converter
-	converters.Update(formats);
-	converters.BuildGraph();
-
 	// Read encodings
 	ReadEncodingsFile("encodings");
 	// Read languages
@@ -434,7 +432,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 	// Bind the X dead keys to the corresponding LyX functions if
 	// necessary. 
 	if (lyxrc.override_x_deadkeys)
-		deadKeyBindings(toplevel_keymap);
+		deadKeyBindings(toplevel_keymap.get());
 
 	if (lyxerr.debugging(Debug::LYXRC)) {
 		lyxrc.print();
@@ -469,6 +467,7 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 	kbmap->bind("Down", LFUN_DOWN);
 	
 	kbmap->bind("Tab", LFUN_TAB);
+	kbmap->bind("ISO_Left_Tab", LFUN_TAB); // jbl 2001-23-02
 	
 	kbmap->bind("Home", LFUN_HOME);
 	kbmap->bind("End", LFUN_END);
@@ -507,6 +506,7 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 	
         kbmap->bind("C-Tab", LFUN_TABINSERT);  // ale970515
 	kbmap->bind("S-Tab", LFUN_SHIFT_TAB);  // jug20000522
+	kbmap->bind("S-ISO_Left_Tab", LFUN_SHIFT_TAB); // jbl 2001-23-02
 }