[evolution] EHTMLEditorView - Undoing the citation split does not re-wrap and re-quote the block

[Tomas Popela <tpopela src gnome org>]

commit 32a7b2d8cccd4364eac1ba6c42a5e322e531c362
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Feb 12 10:47:19 2016 +0100

    EHTMLEditorView - Undoing the citation split does not re-wrap and re-quote the block

 e-util/e-html-editor-view.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 1bacd93..13d69b5 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -14430,16 +14430,6 @@ undo_redo_citation_split (EHTMLEditorView *view,
                        return;
 
                parent = get_parent_block_element (WEBKIT_DOM_NODE (selection_start));
-
-               if (!event->data.fragment ||
-                   !webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (event->data.fragment))) {
-                       remove_node (WEBKIT_DOM_NODE (parent));
-                       merge_siblings_if_necessary (document, NULL);
-                       restore_selection_to_history_event_state (view, event->before);
-
-                       return;
-               }
-
                citation_before = webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (parent));
                if (!is_citation_node (citation_before)) {
                        e_html_editor_selection_restore (selection);
@@ -14468,7 +14458,7 @@ undo_redo_citation_split (EHTMLEditorView *view,
                if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (tmp))
                        remove_node (tmp);
 
-               if (in_situ) {
+               if (in_situ && event->data.fragment) {
                        webkit_dom_node_append_child (
                                webkit_dom_node_get_parent_node (last_child),
                                webkit_dom_node_clone_node (