From ea81b496bec5a836f1f0481e8a249e34d7e3f048 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 28 Dec 2006 10:24:45 +0000 Subject: [PATCH] remove useless in_ert variable git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16411 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/text.C | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/text.C b/src/text.C index 6397552321..5cebd7ef67 100644 --- a/src/text.C +++ b/src/text.C @@ -1779,7 +1779,6 @@ bool LyXText::dissolveInset(LCursor & cur) { if (isMainText(*cur.bv().buffer()) || cur.inset().nargs() != 1) return false; - bool const in_ert = cur.inset().lyxCode() == InsetBase::ERT_CODE; recordUndoInset(cur); cur.selHandle(false); // save position @@ -1796,17 +1795,14 @@ bool LyXText::dissolveInset(LCursor & cur) { Buffer & b = cur.buffer(); cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges); if (!plist.empty()) { - if (in_ert) { - // ERT paragraphs have the Language latex_language. - // This is invalid outside of ERT, so we need to - // change it to the buffer language. - ParagraphList::iterator it = plist.begin(); - ParagraphList::iterator it_end = plist.end(); - for (; it != it_end; it++) { - it->changeLanguage(b.params(), - latex_language, - b.getLanguage()); - } + // ERT paragraphs have the Language latex_language. + // This is invalid outside of ERT, so we need to + // change it to the buffer language. + ParagraphList::iterator it = plist.begin(); + ParagraphList::iterator it_end = plist.end(); + for (; it != it_end; it++) { + it->changeLanguage(b.params(), latex_language, + b.getLanguage()); } pasteParagraphList(cur, plist, b.params().textclass, -- 2.39.2