[evolution/gnome-3-18] EHTMLEditorView - After undoing the HISTORY_DELETE operation always re-wrap and re-quote current blo

[Tomas Popela <tpopela src gnome org>]

commit cc5dd3b04027978925f60c5eaaa380e9bf3d36e4
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Nov 20 14:34:34 2015 +0100

    EHTMLEditorView - After undoing the HISTORY_DELETE operation always re-wrap and re-quote current block

 e-util/e-html-editor-view.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 1c8841b..a772aef 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -12874,12 +12874,12 @@ undo_delete (EHTMLEditorView *view,
 
                remove_node (WEBKIT_DOM_NODE (element));
 
-               if (event->type == HISTORY_DELETE && !view->priv->html_mode &&
-                   !webkit_dom_document_fragment_query_selector (event->data.fragment, ".-x-evo-quoted", 
NULL)) {
+               if (event->type == HISTORY_DELETE && !view->priv->html_mode) {
                        WebKitDOMNode *current_block;
 
                        current_block = e_html_editor_get_parent_block_node_from_child (parent);
-                       wrap_and_quote_element (view, WEBKIT_DOM_ELEMENT (current_block));
+                       if (get_citation_level (current_block, FALSE) > 0)
+                               wrap_and_quote_element (view, WEBKIT_DOM_ELEMENT (current_block));
                }
 
                /* If the selection markers are presented restore the selection,