From: Joakim Verona <joakim@verona.se>
Date: Tue, 29 Sep 2015 18:35:46 +0000 (+0200)
Subject: fix conflict
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1a5a724753d777ebb092038c4ca56e5adb51c4a;p=emacs.git

fix conflict
---

c1a5a724753d777ebb092038c4ca56e5adb51c4a
diff --cc src/xdisp.c
index fe76bf13419,863d891c2de..73b30e850d2
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@@ -5920,11 -5913,13 +5938,18 @@@ push_it (struct it *it, struct text_po
      case GET_FROM_STRETCH:
        p->u.stretch.object = it->object;
        break;
 +#ifdef HAVE_XWIDGETS
 +    case GET_FROM_XWIDGET:
 +      p->u.xwidget.object = it->object;
 +      break;
 +#endif
+     case GET_FROM_BUFFER:
+     case GET_FROM_DISPLAY_VECTOR:
+     case GET_FROM_STRING:
+     case GET_FROM_C_STRING:
+       break;
+     default:
+       emacs_abort ();
      }
    p->position = position ? *position : it->position;
    p->current = it->current;