- lyxsweave.R: set missing SVN EOL style and add missing makefile entry

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 2d6611211c56a9543a94b41067004df3b3909a0f..4992de8e73a6bede93ddee20d00f1441041e263c 100644 (file)
--- 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
@@ -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);
@@ -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