From d1afa0e19b3f3f6476551857a4fc0b860ebf84ac Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 4 Aug 2015 15:34:57 +0100
Subject: [PATCH] Edje entry: Clean up conditions a bit.

Merge two conditions to clean up the code a bit.
---
 src/lib/edje/edje_entry.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index eab317f028..c095f1621d 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -245,16 +245,15 @@ _text_filter_markup_prepend_internal(Edje *ed, Entry *en, Evas_Textblock_Cursor
                     eina_unicode_utf8_get_len(info->change.insert.content);
                }
           }
-        if (have_sel)
-          {
-            if (info)
-              {
-                 info->merge = EINA_TRUE;
-              }
-          }
         if (info)
-          info->change.insert.pos =
-            evas_textblock_cursor_pos_get(en->cursor);
+          {
+             if (have_sel)
+               {
+                  info->merge = EINA_TRUE;
+               }
+             info->change.insert.pos =
+                evas_textblock_cursor_pos_get(en->cursor);
+          }
         if (fmtpre) _text_filter_format_prepend(ed, en, en->cursor, fmtpre);
         evas_object_textblock_text_markup_prepend(c, text);
         free(text);