EFL core migration revision 68847

Merge remote-tracking branch 'remotes/origin/upstream'

diff --cc src/lib/Edje.h
Simple merge

diff --cc src/lib/edje_entry.c
index 5d857e3,bcda2c9..e1430f5
--- 1/src/lib/edje_entry.c
--- 2/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@@ -3987,29 -3304,8 +4044,28 @@@ _edje_entry_imf_event_preedit_changed_c
       {
          /* delete selected characters */
          _range_del_emit(ed, en->cursor, rp->object, en);
-         _sel_clear(en->cursor, rp->object, en);
       }
  
 +   if (en->preedit_start && en->preedit_end)
 +     {
 +        /* extract the tag string */
 +        char *str = evas_textblock_cursor_range_text_get(en->preedit_start, en->preedit_end, EVAS_TEXTBLOCK_TEXT_MARKUP);
 +
 +        if (str)
 +          {
 +             preedit_tag_index = strstr(str, "<preedit");
 +
 +             if ((preedit_tag_index - str) > 0)
 +               {
 +                  pretag = calloc(1, sizeof(char)*(preedit_tag_index-str+1));
 +                  if (preedit_tag_index)
 +                    {
 +                       strncpy(pretag, str, preedit_tag_index-str);
 +                    }
 +               }
 +          }
 +     }
 +
     /* delete preedit characters */
     _preedit_del(en);
  

diff --cc src/lib/edje_private.h
Simple merge

diff --cc src/lib/edje_util.c
Simple merge