fix conflict

diff --cc configure.ac
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
index fe76bf134191cc9ce3a4aaeb58e84d22160cfb1d,863d891c2de64727c7a77e1dd6bf3cb047a54976..73b30e850d268e8ad43e5f306b54f2f2a176cfa0
--- 1/src/xdisp.c
--- 2/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;

diff --cc src/xterm.c
Simple merge