* Update::SinglePar is enough, Update::Force is a fullscreen update

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23251 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index cf5a701629580eacdb86f6c2144be95e5eb07160..f6888743bee6de708bc21977446e03b81157427b 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2221,13 +2221,10 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
        
        // set update flags
        if (changed) {
-               //lyxerr << "inlineCompletion changed" << std::endl;
-               
-               Update::flags flags
-               = cur.disp_.update() | Update::Force;
-               if (singlePar && !(flags | Update::SinglePar))
-                   flags = flags | Update::SinglePar;
-               cur.updateFlags(flags);
+               if (singlePar && !(cur.disp_.update() | Update::Force))
+                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+               else
+                       cur.updateFlags(cur.disp_.update() | Update::Force);
        }
 }
 

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 647ccef41781650d06420b3939d83bfd7d8a4392..b6062d3500edb9f12a44139f4ab0f13baf1e80bd 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -547,7 +547,7 @@ bool InsetText::insertCompletion(Cursor & cur, docstring const & s,
        cur.insert(s);
        cur.bv().cursor() = cur;
        if (!(cur.disp_.update() & Update::Force))
-               cur.updateFlags(cur.disp_.update() | Update::Force | Update::SinglePar);
+               cur.updateFlags(cur.disp_.update() | Update::SinglePar);
        return true;
 }
 

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index b86d36ca6bdc97e5af058fb4f3023825158f9075..6955de032f6af234ad341f9f2b054ca2a629f494 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -804,7 +804,7 @@ bool MathMacro::insertCompletion(Cursor & cur, docstring const & s,
        if (finished) {
                cur.bv().cursor().pop();
                ++cur.bv().cursor().pos();
-               cur.updateFlags(Update::Force | Update::SinglePar);
+               cur.updateFlags(Update::SinglePar);
        }
        
        return true;