X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=9cd448ea0b6cedd95860764ab874699f55e5af05;hb=8b7584846c4e1a9c87a004fab479722fee7e3013;hp=e929bb49b699830a8d6015f293e2732911942a2e;hpb=22df620984c0172342edf93357c535d91938309a;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index e929bb49b6..9cd448ea0b 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -286,13 +286,9 @@ int LyX::exec(int & argc, char * argv[])
 		init_package(os::utf8_argv(0), string(), string(),
 			top_build_dir_is_one_level_up);
 	} catch (ExceptionMessage const & message) {
-		if (message.type_ == ErrorException) {
-			Alert::error(message.title_, message.details_);
-			lyx_exit(1);
-		} else if (message.type_ == WarningException) {
-			Alert::warning(message.title_, message.details_);
-		}
+		LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_);
 	}
+	// FIXME: This breaks out of source build under Windows.
 	locale_init();
 
 	// Here we need to parse the command line. At least
@@ -369,7 +365,7 @@ int LyX::exec(int & argc, char * argv[])
 		prepareExit();
 		return exit_status;
 	}
- 
+
 	// FIXME
 	/* Create a CoreApplication class that will provide the main event loop
 	* and the socket callback registering. With Qt4, only QtCore
@@ -500,7 +496,7 @@ bool LyX::loadFiles()
 			continue;
 
 		Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName(), false);
-		if (buf->loadLyXFile(fname)) {
+		if (buf->loadLyXFile(fname) == Buffer::ReadSuccess) {
 			ErrorList const & el = buf->errorList("Parse");
 			if (!el.empty())
 				for_each(el.begin(), el.end(),
@@ -553,7 +549,7 @@ void LyX::execCommands()
 			break;
 		}
 	}
-	
+
 	// create the first main window
 	lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg));
 
@@ -681,7 +677,7 @@ static void error_handler(int err_sig)
 		(err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) {
 #else
 	if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) {
-#endif 
+#endif
 #ifdef _MSC_VER
 		// with abort() it crashes again.
 		exit(err_sig);
@@ -812,6 +808,7 @@ bool LyX::init()
 	// Set up command definitions
 	pimpl_->toplevel_cmddef_.read(lyxrc.def_file);
 
+	// FIXME
 	// Set up bindings
 	pimpl_->toplevel_keymap_.read("site");
 	pimpl_->toplevel_keymap_.read(lyxrc.bind_file);
@@ -853,7 +850,7 @@ bool LyX::init()
 	// This must happen after package initialization and after lyxrc is
 	// read, therefore it can't be done by a static object.
 	ConverterCache::init();
-		
+
 	return true;
 }
 
@@ -889,7 +886,7 @@ static bool needsUpdate(string const & file)
 		firstrun = false;
 	}
 
-	FileName absfile = 
+	FileName absfile =
 		FileName(addName(package().user_support().absFileName(), file));
 	return !absfile.exists()
 		|| configure_script.lastModified() > absfile.lastModified();
@@ -1138,14 +1135,14 @@ int parse_geometry(string const & arg1, string const &, string &)
 }
 
 
-int parse_batch(string const &, string const &, string &) 
+int parse_batch(string const &, string const &, string &)
 {
 	use_gui = false;
 	return 0;
 }
 
 
-int parse_force(string const & arg, string const &, string &) 
+int parse_force(string const & arg, string const &, string &)
 {
 	if (arg == "all") {
 		force_overwrite = ALL_FILES;
@@ -1358,39 +1355,48 @@ SpellChecker * theSpellChecker()
 
 void setSpellChecker()
 {
-#if defined(USE_MACOSX_PACKAGING)
+	SpellChecker::ChangeNumber speller_change_number =singleton_->pimpl_->spell_checker_ ?
+		singleton_->pimpl_->spell_checker_->changeNumber() : 0;
+
 	if (lyxrc.spellchecker == "native") {
+#if defined(USE_MACOSX_PACKAGING)
 		if (!singleton_->pimpl_->apple_spell_checker_)
 			singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker();
 		singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_;
-		return;
-	}
+#else
+		singleton_->pimpl_->spell_checker_ = 0;
 #endif
+	} else if (lyxrc.spellchecker == "aspell") {
 #if defined(USE_ASPELL)
-	if (lyxrc.spellchecker == "aspell") {
 		if (!singleton_->pimpl_->aspell_checker_)
 			singleton_->pimpl_->aspell_checker_ = new AspellChecker();
 		singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_;
-		return;
-	}
+#else
+		singleton_->pimpl_->spell_checker_ = 0;
 #endif
+	} else if (lyxrc.spellchecker == "enchant") {
 #if defined(USE_ENCHANT)
-	if (lyxrc.spellchecker == "enchant") {
 		if (!singleton_->pimpl_->enchant_checker_)
 			singleton_->pimpl_->enchant_checker_ = new EnchantChecker();
 		singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_;
-		return;
-	}
+#else
+		singleton_->pimpl_->spell_checker_ = 0;
 #endif
+	} else if (lyxrc.spellchecker == "hunspell") {
 #if defined(USE_HUNSPELL)
-	if (lyxrc.spellchecker == "hunspell") {
 		if (!singleton_->pimpl_->hunspell_checker_)
 			singleton_->pimpl_->hunspell_checker_ = new HunspellChecker();
 		singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_;
-		return;
-	}
+#else
+		singleton_->pimpl_->spell_checker_ = 0;
 #endif
-	singleton_->pimpl_->spell_checker_ = 0;
+	} else {
+		singleton_->pimpl_->spell_checker_ = 0;
+	}
+	if (singleton_->pimpl_->spell_checker_) {
+		singleton_->pimpl_->spell_checker_->changeNumber(speller_change_number);
+		singleton_->pimpl_->spell_checker_->advanceChangeNumber();
+	}
 }
 
 } // namespace lyx