Fix part of bug #6127: Roundtrip Lyx->Latex->Lyx fails.

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index b6dde89ed3592d67003b31680062d70c66ec07c1..55cd35ceb5b43c87a5d92dd3f2dff86c0fbb269b 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -17,7 +17,7 @@
 
 #include "LyX.h"
 
-#include "ASpell_local.h"
+#include "AspellChecker.h"
 #include "Buffer.h"
 #include "BufferList.h"
 #include "CmdDef.h"
@@ -130,7 +130,7 @@ struct LyX::Impl
                messages_["GUI"] = Messages();
 
 #if defined(USE_ASPELL)
-               spell_checker_ = new ASpell();
+               spell_checker_ = new AspellChecker();
 #else
                spell_checker_ = 0;
 #endif
@@ -764,7 +764,7 @@ bool LyX::init()
        pimpl_->toplevel_keymap_.read("site");
        pimpl_->toplevel_keymap_.read(lyxrc.bind_file);
        // load user bind file user.bind
-       pimpl_->toplevel_keymap_.read("user");
+       pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK);
 
        pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_);
 
@@ -984,7 +984,7 @@ int parse_help(string const &, string const &, string &)
                  "                  where fmt is the export format of choice.\n"
                  "                  Look on Tools->Preferences->File formats->Format\n"
                  "                  to get an idea which parameters should be passed.\n"
-                 "                  Note that the order of -e and -x switches matters."
+                 "                  Note that the order of -e and -x switches matters.\n"
                  "\t-i [--import] fmt file.xxx\n"
                  "                  where fmt is the import format of choice\n"
                  "                  and file.xxx is the file to be imported.\n"