anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/text.C: fix dissolve-inset when pressing

Browse Source 
erase at the end of the inset


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16050 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-11-26 00:04:25 +00:00
parent d4ba38a59c
commit 7913b8c652
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/text.C
View File

@ -1668,7 +1668,10 @@ bool LyXText::erase(LCursor & cur)
if (par.isDeleted(cur.pos()))
cur.forwardPosNoDescend();
needsUpdate = true;
} else if (cur.pit() != cur.lastpit()) {
} else {
if (cur.pit() == cur.lastpit())
return dissolveInset(cur);
if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
par.setChange(cur.pos(), Change(Change::DELETED));
cur.forwardPos();
@ -1677,8 +1680,6 @@ bool LyXText::erase(LCursor & cur)
setCursorIntern(cur, cur.pit() + 1, 0);
needsUpdate = backspacePos0(cur);
}
} else {
needsUpdate = dissolveInset(cur);
}
// FIXME: Inserting characters has nothing to do with setting a cursor.