summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d4ba38a)
erase at the end of the inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16050
a592a061-630c-0410-9148-
cb99ea01b6c8
if (par.isDeleted(cur.pos()))
cur.forwardPosNoDescend();
needsUpdate = true;
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();
if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
par.setChange(cur.pos(), Change(Change::DELETED));
cur.forwardPos();
setCursorIntern(cur, cur.pit() + 1, 0);
needsUpdate = backspacePos0(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.
}
// FIXME: Inserting characters has nothing to do with setting a cursor.