[evolution/wip/webkit2] Bug 757658 - Still broken deletion/undo of quotes in mail composer

[Milan Crha <mcrha src gnome org>]

commit 706a478b0bc868c678f887f8616ef417ceab8e4c
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Mar 2 16:09:51 2016 +0100

    Bug 757658 - Still broken deletion/undo of quotes in mail composer

 .../composer/e-html-editor-view-dom-functions.c    |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/web-extensions/composer/e-html-editor-view-dom-functions.c 
b/web-extensions/composer/e-html-editor-view-dom-functions.c
index 0b83b23..6f2ff72 100644
--- a/web-extensions/composer/e-html-editor-view-dom-functions.c
+++ b/web-extensions/composer/e-html-editor-view-dom-functions.c
@@ -8490,7 +8490,7 @@ dom_delete_character_from_quoted_line_start (WebKitDOMDocument *document,
 {
        gboolean success = FALSE;
        WebKitDOMElement *element;
-       WebKitDOMNode *node, *beginning;
+       WebKitDOMNode *node, *beginning, *next_sibling;
 
        /* We have to be in quoted content. */
        if (!dom_selection_is_citation (document))
@@ -8509,7 +8509,8 @@ dom_delete_character_from_quoted_line_start (WebKitDOMDocument *document,
        node = webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (element));
 
        /* We have to be on the end of line. */
-       if (webkit_dom_node_get_next_sibling (node))
+       next_sibling = webkit_dom_node_get_next_sibling (node);
+       if (next_sibling && (!WEBKIT_DOM_IS_HTML_BR_ELEMENT (next_sibling) || 
webkit_dom_node_get_next_sibling (next_sibling)))
                goto out;
 
        /* Before the caret is just text. */