anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Account for shadowed system macros

Browse Source 
Part of #10694.

(cherry picked from commit d58d3f6774)
This commit is contained in:
Enrico Forestieri 2017-10-22 23:09:37 +02:00
parent 71a35ea45b
commit 8f7b40955c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Cursor.cpp
View File

@ -1464,9 +1464,10 @@ bool Cursor::macroModeClose()
MathWordList const & words = mathedWordList(); MathWordList const & words = mathedWordList();
MathWordList::const_iterator it = words.find(name); MathWordList::const_iterator it = words.find(name);
bool keep_mathmode = it != words.end() && (it->second.inset == "font" bool keep_mathmode = user_macro
|| it->second.inset == "oldfont" || (it != words.end() && (it->second.inset == "font"
|| it->second.inset == "mbox"); || it->second.inset == "oldfont"
|| it->second.inset == "mbox"));
bool ert_macro = !user_macro && it == words.end() && atomAsMacro; bool ert_macro = !user_macro && it == words.end() && atomAsMacro;
if (in && in->currentMode() == Inset::TEXT_MODE if (in && in->currentMode() == Inset::TEXT_MODE