[evolution/gnome-3-16] EHTMLEditorView - Caret is moved on end of block when pressing Backspace on its start

[Tomas Popela <tpopela src gnome org>]

commit 562f33051ae669e46180f6d3d2b0a317f54ea790
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Mar 31 13:42:17 2015 +0200

    EHTMLEditorView - Caret is moved on end of block when pressing Backspace on its start
    
    Don't insert the selection into newly created paragraph when its inner HTML
    contain the selection markers.

 e-util/e-html-editor-view.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 298e1d3..8f07e59 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -1178,8 +1178,10 @@ insert_new_line_into_citation (EHTMLEditorView *view,
                        WEBKIT_DOM_HTML_ELEMENT (paragraph),
                        html_to_insert,
                        NULL);
-               add_selection_markers_into_element_end (
-                       document, paragraph, NULL, NULL);
+
+               if (!webkit_dom_element_query_selector (paragraph, "#-x-evo-selection-start-marker", NULL))
+                       add_selection_markers_into_element_end (
+                               document, paragraph, NULL, NULL);
        } else
                paragraph = prepare_paragraph (selection, document, TRUE);