Fix bug #6997

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index de977ffa8a6b62cd5f0dabd2a8cfa943761e59bf..d00d2d5356ee710b7fa26a2e9df288173a89a118 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -53,7 +53,6 @@
 #include "insets/InsetText.h"
 #include "insets/InsetBibitem.h"
 #include "insets/InsetCaption.h"
-#include "insets/InsetLine.h"
 #include "insets/InsetNewline.h"
 #include "insets/InsetNewpage.h"
 #include "insets/InsetArgument.h"
@@ -452,11 +451,6 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
                auto_ptr<Inset> inset(new InsetTabular(buf));
                inset->read(lex);
                par.insertInset(par.size(), inset.release(), font, change);
-       } else if (token == "\\lyxline") {
-               auto_ptr<Inset> inset;
-               inset.reset(new InsetLine);
-               inset->setBuffer(*buf);
-               par.insertInset(par.size(), inset.release(), font, change);
        } else if (token == "\\change_unchanged") {
                change = Change(Change::UNCHANGED);
        } else if (token == "\\change_inserted" || token == "\\change_deleted") {
@@ -525,6 +519,9 @@ void Text::readParagraph(Paragraph & par, Lexer & lex,
 
        // Initialize begin_of_body_ on load; redoParagraph maintains
        par.setBeginOfBody();
+       
+       // mark paragraph for spell checking on load
+       // par.requestSpellCheck();
 }
 
 
@@ -939,23 +936,17 @@ void Text::insertChar(Cursor & cur, char_type c)
        // disable the double-space checking
        if (!freeSpacing && isLineSeparatorChar(c)) {
                if (cur.pos() == 0) {
-                       static bool sent_space_message = false;
-                       if (!sent_space_message) {
-                               cur.message(_("You cannot insert a space at the "
-                                                          "beginning of a paragraph. Please read the Tutorial."));
-                               sent_space_message = true;
-                       }
+                       cur.message(_(
+                                       "You cannot insert a space at the "
+                                       "beginning of a paragraph. Please read the Tutorial."));
                        return;
                }
                LASSERT(cur.pos() > 0, /**/);
                if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
-                   && !par.isDeleted(cur.pos() - 1)) {
-                       static bool sent_space_message = false;
-                       if (!sent_space_message) {
-                               cur.message(_("You cannot type two spaces this way. "
-                                                          "Please read the Tutorial."));
-                               sent_space_message = true;
-                       }
+                               && !par.isDeleted(cur.pos() - 1)) {
+                       cur.message(_(
+                                       "You cannot type two spaces this way. "
+                                       "Please read the Tutorial."));
                        return;
                }
        }
@@ -2039,8 +2030,8 @@ bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/
        LASSERT(cur.bv().cursor() == cur, /**/);
        cur.insert(s);
        cur.bv().cursor() = cur;
-       if (!(cur.result().update() & Update::Force))
-               cur.screenUpdateFlags(cur.result().update() | Update::SinglePar);
+       if (!(cur.result().screenUpdate() & Update::Force))
+               cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
        return true;
 }