[LyX/master] Don't merge next paragraph when removing a separator inset

[Enrico Forestieri]

commit 5c891242f3828453ce6843704334284a867b5262
Author: Enrico Forestieri <for...@lyx.org>
Date:   Sat Jan 16 16:44:26 2016 +0100

    Don't merge next paragraph when removing a separator inset

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 1fa3c06..fbcd9b7 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1048,22 +1048,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_CHAR_DELETE_FORWARD:
                if (!cur.selection()) {
-                       bool was_separator = 
cur.paragraph().isEnvSeparator(cur.pos());
                        if (cur.pos() == cur.paragraph().size())
                                // Par boundary, force full-screen update
                                singleParUpdate = false;
                        needsUpdate |= erase(cur);
                        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 {
                        cutSelection(cur, true, false);
                        singleParUpdate = false;