Fix bug 2474; partial fix for 1777. Added last_reference_ member to QRef class and...

[lyx.git] / src / cursor.C

diff --git a/src/cursor.C b/src/cursor.C
index 68a5e8ba4b711b71a8318c30d88dcec008ff4c9e..e1ff22f267cac95e6277b9f5f536935d7f432617 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -899,14 +899,11 @@ bool LCursor::macroModeClose()
        if (s == "\\")
                return false;
 
-       // prevent entering of recursive macros
-       // FIXME: this is only a weak attempt... only prevents immediate
-       // recursion
-       docstring const name = s.substr(1);
-       InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE);
-       if (macro && macro->getInsetName() == name)
-               lyxerr << "can't enter recursive macro" << endl;
+       // trigger updates of macros, at least, if no full
+       // updates take place anyway
+       updateFlags(Update::Force);
 
+       docstring const name = s.substr(1);
        InsetMathNest * const in = inset().asInsetMath()->asNestInset();
        if (in && in->interpretString(*this, s))
                return true;