anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 06:19:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't merge next paragraph when removing a separator inset

Browse Source
This commit is contained in:
Enrico Forestieri 2016-01-16 16:44:26 +01:00
parent 55b3374f3e
commit 5c891242f3
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Text3.cpp
View File

@ -1048,22 +1048,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_CHAR_DELETE_FORWARD: case LFUN_CHAR_DELETE_FORWARD:
if (!cur.selection()) { if (!cur.selection()) {
bool was_separator = cur.paragraph().isEnvSeparator(cur.pos());
if (cur.pos() == cur.paragraph().size()) if (cur.pos() == cur.paragraph().size())
// Par boundary, force full-screen update // Par boundary, force full-screen update
singleParUpdate = false; singleParUpdate = false;
needsUpdate |= erase(cur); needsUpdate |= erase(cur);
cur.resetAnchor(); cur.resetAnchor();
if (was_separator && cur.pos() == cur.paragraph().size()
&& (!cur.paragraph().layout().isEnvironment()
|| cur.paragraph().size() > 0)) {
// Force full-screen update
singleParUpdate = false;
needsUpdate |= erase(cur);
cur.resetAnchor();
}
// It is possible to make it a lot faster still
// just comment out the line below...
} else { } else {
cutSelection(cur, true, false); cutSelection(cur, true, false);
singleParUpdate = false; singleParUpdate = false;