- 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 298fe09fd88fcdf3d9dba6dd4b99cf1b2f5adc4d..4992de8e73a6bede93ddee20d00f1441041e263c 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -808,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);
@@ -1354,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